diff --git a/doc/dev/build.sh b/doc/dev/build.sh
index 1afb7ca20730eae9fc9f597c0b579b070b4bcff2..2e8deb56d35106aba076b097148f66f540ae6af5 100755
--- a/doc/dev/build.sh
+++ b/doc/dev/build.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 echo " PDF  documentation.org"
-emacs -Q -q -nw --batch                                 \
+emacs -nw --batch                                       \
       --eval "(require 'org)"                           \
       --eval "(require 'ox-latex)"                      \
       --eval "(load-file \"../tools/setup.el\")"        \
@@ -9,12 +9,10 @@ emacs -Q -q -nw --batch                                 \
       -f org-latex-export-to-pdf
 
 echo " HTML documentation.org"
-emacs -Q -q -nw --batch                                 \
+emacs -nw --batch                                       \
       --eval "(require 'org)"                           \
       --eval "(require 'ox-latex)"                      \
       --eval "(require 'ox-html)"                       \
-      --eval "(package-initialize)"                     \
-      --eval "(require 'htmlize)"                       \
       --eval "(load-file \"../tools/setup.el\")"        \
       --file ./documentation.org                        \
       -f org-html-export-to-html
diff --git a/doc/tools/setup.el b/doc/tools/setup.el
index 027e5700dd360bf37e1484d635446d7b81d9f8df..e7d7b765fabc56a73a2650d2da80d1a80719b872 100644
--- a/doc/tools/setup.el
+++ b/doc/tools/setup.el
@@ -1,6 +1,18 @@
 (require 'org)
 (require 'subr-x)
 
+;; Needed packages
+
+(require 'package)
+(add-to-list 'package-archives
+             '("melpa" . "https://melpa.org/packages/"))
+
+(package-initialize)
+
+;;; Install HTMLIZE
+(package-install 'htmlize)
+(require 'htmlize)
+
 ;; LaTeX config
 
 (add-to-list
diff --git a/doc/users/build.sh b/doc/users/build.sh
index 1afb7ca20730eae9fc9f597c0b579b070b4bcff2..2e8deb56d35106aba076b097148f66f540ae6af5 100755
--- a/doc/users/build.sh
+++ b/doc/users/build.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 echo " PDF  documentation.org"
-emacs -Q -q -nw --batch                                 \
+emacs -nw --batch                                       \
       --eval "(require 'org)"                           \
       --eval "(require 'ox-latex)"                      \
       --eval "(load-file \"../tools/setup.el\")"        \
@@ -9,12 +9,10 @@ emacs -Q -q -nw --batch                                 \
       -f org-latex-export-to-pdf
 
 echo " HTML documentation.org"
-emacs -Q -q -nw --batch                                 \
+emacs -nw --batch                                       \
       --eval "(require 'org)"                           \
       --eval "(require 'ox-latex)"                      \
       --eval "(require 'ox-html)"                       \
-      --eval "(package-initialize)"                     \
-      --eval "(require 'htmlize)"                       \
       --eval "(load-file \"../tools/setup.el\")"        \
       --file ./documentation.org                        \
       -f org-html-export-to-html