diff --git a/doc/Makefile b/doc/Makefile
index e17d4415b..c37c80133 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -27,6 +27,12 @@ guide::		orgguide.texi org-version.inc
 	../mk/guidesplit.pl $@/*
 endif
 
+org.texi:
+	$(BATCH) \
+	  --eval '(add-to-list '"'"'load-path "../lisp")' \
+	  --eval '(load "../mk/org-fixup.el")' \
+	  --eval '(org-make-manuals)'
+
 org-version.inc:	org.texi
 	@echo "org-version: $(ORGVERSION) ($(GITVERSION))"
 	@echo "@c automatically generated, do not edit"  > org-version.inc
diff --git a/mk/org-fixup.el b/mk/org-fixup.el
index 7691c73fa..d2bdf9c70 100644
--- a/mk/org-fixup.el
+++ b/mk/org-fixup.el
@@ -27,6 +27,13 @@
 (require 'autoload)
 (require 'org-compat "org-compat.el")
 
+(defun org-make-manuals ()
+  "Generate the Texinfo files out of Org manuals."
+  (require 'ox-texinfo)
+  (dolist (manual '("../doc/org-manual.org"))
+    (find-file manual)
+    (org-texinfo-export-to-texinfo)))
+
 (defun org-make-org-version (org-release org-git-version odt-dir)
   "Make the file org-version.el in the current directory.
 This function is internally used by the build system and should