diff --git a/doc/lisp/build-doc-config.el b/doc/lisp/build-doc-config.el
index ee9826245dcf4ed0671070eb9d6b172ba7b34369..0dbe8794b2c6c981ac6671cb2b9509599fb446e5 100644
--- a/doc/lisp/build-doc-config.el
+++ b/doc/lisp/build-doc-config.el
@@ -48,10 +48,7 @@
  '(org-html-validation-link nil)
  '(org-src-fontify-natively t)
  '(org-html-htmlize-output-type 'css)
- '(org-latex-listings 'minted))
-
-(setq org-latex-minted-options
-      '(("linenos=true") ("breaklines") ("autogobble")))
+ )
 
 (defun org-export-output-file-name-modified (orig-fun extension &optional subtreep pub-dir)
   (unless pub-dir
@@ -62,7 +59,6 @@
 (advice-add 'org-export-output-file-name :around #'org-export-output-file-name-modified)
 
 (setq org-latex-listings 'minted
-      org-latex-packages-alist '(("" "minted"))
       org-latex-pdf-process
       '("cd ${PUGS_BINARY_DIR}/doc; ./build-userdoc-pdf.sh"))
 
diff --git a/doc/userdoc.org b/doc/userdoc.org
index cca6363ed3a545ea0515d43f03ee716810e8ef3d..ab88c8dbe1920d7c968ed3d777e7974c44954bf1 100644
--- a/doc/userdoc.org
+++ b/doc/userdoc.org
@@ -31,7 +31,7 @@
 #+LATEX_HEADER_EXTRA: \usepackage{mdframed}
 #+LATEX_HEADER_EXTRA: \usepackage{mathpazo}
 #+LATEX_HEADER_EXTRA: \usepackage{inconsolata}
-
+#+LATEX_HEADER_EXTRA: \IfFileExists{minted2.sty}{\usepackage{minted2}}{\usepackage{minted}}
 #+LATEX_HEADER_EXTRA:  %Patch accsupp to avoid copying line numbers when copying from listing
 #+LATEX_HEADER_EXTRA: \usepackage{accsupp}
 #+LATEX_HEADER_EXTRA: \newcommand\emptyaccsupp[1]{\BeginAccSupp{ActualText={}}#1\EndAccSupp{}}