diff --git a/configure.ac b/configure.ac
index 5775b989..9fc539ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -306,14 +306,15 @@ AS_IF([test "x$PMCCABE" = "xno"],[
 AC_CONFIG_FILES([
 Makefile
 texi/Makefile
-texi/version.texi
 mu/Makefile
 mu/tests/Makefile
 lib/Makefile
 lib/tests/Makefile
 mu4e/Makefile
 mu4e/mu4e-meta.el
+mu4e/texi.texi
 guile/Makefile
+guile/texi.texi	
 guile/mu/Makefile
 guile/examples/Makefile
 guile/tests/Makefile
diff --git a/guile/mu-guile.texi b/guile/mu-guile.texi
index 223b05cc..2434fd71 100644
--- a/guile/mu-guile.texi
+++ b/guile/mu-guile.texi
@@ -10,7 +10,8 @@
 
 @documentencoding UTF-8
 @c %**end of header
-@include ../texi/version.texi
+
+@include texi.texi
 
 @copying
 Copyright @copyright{} 2012 Dirk-Jan C. Binnema
@@ -838,5 +839,5 @@ Frequency
 @node GNU Free Documentation License
 @appendix GNU Free Documentation License
 
-@include ../texi/fdl.texi
+@include @value{texidir}/fdl.texi
 @bye
diff --git a/guile/texi.texi.in b/guile/texi.texi.in
new file mode 100644
index 00000000..5040426c
--- /dev/null
+++ b/guile/texi.texi.in
@@ -0,0 +1,6 @@
+@c the version for mu for including in texinfo docs
+@set texidir @abs_top_srcdir@/texi
+
+@c the version for mu for including in texinfo docs
+@set mu-version @VERSION@
+
diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi
index f1943ff7..e45c2a7b 100644
--- a/mu4e/mu4e.texi
+++ b/mu4e/mu4e.texi
@@ -10,7 +10,8 @@
 
 @documentencoding UTF-8
 @c %**end of header
-@include ../texi/version.texi
+
+@include texi.texi
 
 @copying
 Copyright @copyright{} 2012 Dirk-Jan C. Binnema
@@ -3126,7 +3127,7 @@ lines. @t{mu} itself keeps a log as well, you can find this it in
 
 @node GNU Free Documentation License
 @appendix GNU Free Documentation License
-
-@include ../texi/fdl.texi
+ 
+@include @value{texidir}/fdl.texi
 
 @bye
diff --git a/mu4e/texi.texi.in b/mu4e/texi.texi.in
new file mode 100644
index 00000000..5040426c
--- /dev/null
+++ b/mu4e/texi.texi.in
@@ -0,0 +1,6 @@
+@c the version for mu for including in texinfo docs
+@set texidir @abs_top_srcdir@/texi
+
+@c the version for mu for including in texinfo docs
+@set mu-version @VERSION@
+
diff --git a/texi/version.texi.in b/texi/version.texi.in
deleted file mode 100644
index 716d9a9f..00000000
--- a/texi/version.texi.in
+++ /dev/null
@@ -1,3 +0,0 @@
-@c the version for mu for including in texinfo docs
-@set mu-version @VERSION@
-