diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9219372e8..72d9493ac 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -51,9 +51,9 @@ dist_pkgdata_DATA = $(srcdir)/spot.tag
 
 .PHONY: org
 org:
-	cd $(top_srcdir) && make doc/org/init.el
+	cd $(top_builddir) && make doc/org/init.el
 	rm -rf $(srcdir)/userdoc; mkdir -p tmp; cd tmp; \
-	$(EMACS) --batch -Q -l $(abs_srcdir)/org/init.el
+	$(EMACS) --batch -Q -l ../org/init.el
 	rm -rf tmp
 
 ORG_FILES = \
diff --git a/src/ltltest/defs.in b/src/ltltest/defs.in
index 6a05d842e..adb6b341e 100644
--- a/src/ltltest/defs.in
+++ b/src/ltltest/defs.in
@@ -51,6 +51,7 @@ cd $testSubDir
 
 DOT='@DOT@'
 VALGRIND='@VALGRIND@'
+top_srcdir='../@top_srcdir@'
 
 run()
 {
diff --git a/src/ltltest/latex.test b/src/ltltest/latex.test
index 810b830b8..aa3188d9a 100755
--- a/src/ltltest/latex.test
+++ b/src/ltltest/latex.test
@@ -55,7 +55,7 @@ cat <<\EOF
 EOF
 ) > output.tex
 
-TEXINPUTS=$srcdir/../../../doc/tl: \
+TEXINPUTS=$top_srcdir/doc/tl: \
 latexmk -f -silent -pdf -ps- -dvi- -pvc- output.tex
 
 # latexmk will have a non-zero exit status on failure, so we will