diff --git a/doc/org/.dir-locals.el.in b/doc/org/.dir-locals.el.in
index bd9e1b225..bfe995875 100644
--- a/doc/org/.dir-locals.el.in
+++ b/doc/org/.dir-locals.el.in
@@ -10,7 +10,12 @@
 				      path-separator
 				      (getenv "PATH")))
 		      (setenv "PYTHONPATH"
-			      (concat "@abs_top_builddir@/python/.libs:@abs_top_builddir@/python:@abs_top_srcdir@/python:"
+			      (concat "@abs_top_builddir@/python/.libs:"
+				      "@abs_top_builddir@/python:"
+				      "@abs_top_srcdir@/python:"
+				      "@abs_top_builddir@/python/spot/.libs:"
+				      "@abs_top_builddir@/python/spot:"
+				      "@abs_top_srcdir@/python/spot:"
 				      (getenv "PYTHONPATH")))
 		      (setenv "DYLD_LIBRARY_PATH"
 			      (concat "@abs_top_builddir@/python/.libs:@abs_top_builddir@/spot/.libs:@abs_top_builddir@/buddy/spot/.libs:"
diff --git a/doc/org/init.el.in b/doc/org/init.el.in
index 4a275d11f..f1da4bce6 100644
--- a/doc/org/init.el.in
+++ b/doc/org/init.el.in
@@ -33,7 +33,12 @@
 (setenv "PATH"
 	(concat "@abs_top_builddir@/bin" path-separator (getenv "PATH")))
 (setenv "PYTHONPATH"
-	(concat "@abs_top_builddir@/python/.libs:@abs_top_builddir@/python:@abs_top_srcdir@/python:"
+	(concat "@abs_top_builddir@/python/.libs:"
+		"@abs_top_builddir@/python:"
+		"@abs_top_srcdir@/python:"
+		"@abs_top_builddir@/python/spot/.libs:"
+		"@abs_top_builddir@/python/spot:"
+		"@abs_top_srcdir@/python/spot:"
 		(getenv "PYTHONPATH")))
 (setenv "DYLD_LIBRARY_PATH"
 	(concat "@abs_top_builddir@/python/.libs:@abs_top_builddir@/spot/.libs:@abs_top_builddir@/buddy/spot/.libs:"