diff --git a/contrib/lisp/ox-deck.el b/contrib/lisp/ox-deck.el
index dcb58792b..bdcdcbc8e 100644
--- a/contrib/lisp/ox-deck.el
+++ b/contrib/lisp/ox-deck.el
@@ -385,10 +385,10 @@ the \"slide\" class will be added to the to the list element,
 CONTENTS is the transcoded contents string.  INFO is a plist
 holding export options."
   (let ((pkg-info (org-deck--get-packages info))
-         (org-html--pre/postamble-class "deck-status")
-         (info (plist-put
-                (plist-put info :html-preamble (plist-get info :deck-preamble))
-                :html-postamble (plist-get info :deck-postamble))))
+	(org-html--pre/postamble-class "deck-status")
+	(info (plist-put
+	       (plist-put info :html-preamble (plist-get info :deck-preamble))
+	       :html-postamble (plist-get info :deck-postamble))))
     (mapconcat
      'identity
      (list
diff --git a/contrib/lisp/ox-groff.el b/contrib/lisp/ox-groff.el
index ca50b18cf..cd7b78c2b 100644
--- a/contrib/lisp/ox-groff.el
+++ b/contrib/lisp/ox-groff.el
@@ -1949,7 +1949,7 @@ Return PDF file name or an error if it couldn't be produced."
 	  ;; Collect standard errors from output buffer.
 	  (setq errors (org-groff-collect-errors outbuf))))
        (t (error "No valid command to process to PDF")))
-      (let ((pdffile (concat out-dir base-name ".pdf")))
+      (let ((pdffile (concat (file-name-sans-extension full-name) ".pdf")))
 	;; Check for process failure.  Provide collected errors if
 	;; possible.
 	(if (not (file-exists-p pdffile))
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index fdada8bc3..8c628971e 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -2892,7 +2892,7 @@ Return PDF file name or an error if it couldn't be produced."
 	  ;; Collect standard errors from output buffer.
 	  (setq errors (and (not snippet) (org-latex--collect-errors outbuf)))))
        (t (error "No valid command to process to PDF")))
-      (let ((pdffile (concat out-dir base-name ".pdf")))
+      (let ((pdffile (concat (file-name-sans-extension full-name) ".pdf")))
 	;; Check for process failure.  Provide collected errors if
 	;; possible.
 	(if (not (file-exists-p pdffile))
diff --git a/lisp/ox-man.el b/lisp/ox-man.el
index 4a5add893..55a79f76b 100644
--- a/lisp/ox-man.el
+++ b/lisp/ox-man.el
@@ -1233,7 +1233,7 @@ Return PDF file name or an error if it couldn't be produced."
 	  ;; Collect standard errors from output buffer.
 	  (setq errors (org-man-collect-errors outbuf))))
        (t (error "No valid command to process to PDF")))
-      (let ((pdffile (concat out-dir base-name ".pdf")))
+      (let ((pdffile (concat (file-name-sans-extension full-name) ".pdf")))
 	;; Check for process failure.  Provide collected errors if
 	;; possible.
 	(if (not (file-exists-p pdffile))
diff --git a/lisp/ox-texinfo.el b/lisp/ox-texinfo.el
index 9cdd08ebf..b468ce19e 100644
--- a/lisp/ox-texinfo.el
+++ b/lisp/ox-texinfo.el
@@ -1830,7 +1830,7 @@ Return INFO file name or an error if it couldn't be produced."
 	  ;; Collect standard errors from output buffer.
 	  (setq errors (org-texinfo-collect-errors outbuf))))
        (t (error "No valid command to process to Info")))
-      (let ((infofile (concat out-dir base-name ".info")))
+      (let ((infofile (concat (file-name-sans-extension full-name) ".info")))
 	;; Check for process failure.  Provide collected errors if
 	;; possible.
 	(if (not (file-exists-p infofile))