diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 72929cdd2..07c668a80 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -372,18 +372,23 @@ be set to a buffer or a buffer name.  `shell-command' then uses
 it for output."
   (let* ((base-name (file-name-base source))
 	 (full-name (file-truename source))
-	 (out-dir (or (file-name-directory source) "./"))
+         (relative-name (file-relative-name source))
+	 (out-dir (if (file-name-directory source)
+                      ;; Expand "~".  Shell expansion will be disabled
+                      ;; in the shell command call.
+                      (file-name-directory full-name)
+                    "./"))
 	 (output (expand-file-name (concat base-name "." ext) out-dir))
 	 (time (file-attribute-modification-time (file-attributes output)))
 	 (err-msg (if (stringp err-msg) (concat ".  " err-msg) "")))
     (save-window-excursion
       (pcase process
-	((pred functionp) (funcall process (shell-quote-argument source)))
+	((pred functionp) (funcall process (shell-quote-argument relative-name)))
 	((pred consp)
 	 (let ((log-buf (and log-buf (get-buffer-create log-buf)))
 	       (spec (append spec
 			     `((?b . ,(shell-quote-argument base-name))
-			       (?f . ,(shell-quote-argument source))
+			       (?f . ,(shell-quote-argument relative-name))
 			       (?F . ,(shell-quote-argument full-name))
 			       (?o . ,(shell-quote-argument out-dir))
 			       (?O . ,(shell-quote-argument output))))))
diff --git a/lisp/ox.el b/lisp/ox.el
index d5f9e96c3..495d27395 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -6770,7 +6770,6 @@ Return file name as a string."
 	  (cond
 	   (pub-dir (concat (file-name-as-directory pub-dir)
 			    (file-name-nondirectory base-name)))
-	   ((file-name-absolute-p base-name) base-name)
 	   (t base-name))))
     ;; If writing to OUTPUT-FILE would overwrite original file, append
     ;; EXTENSION another time to final name.