diff --git a/lisp/org-lparse.el b/lisp/org-lparse.el
index 52518b357..9d1e03421 100644
--- a/lisp/org-lparse.el
+++ b/lisp/org-lparse.el
@@ -67,7 +67,7 @@ lists."
 	       ((file-exists-p file-or-buf) file-or-buf)
 	       (t (error "org-lparse-and-open: This shouldn't happen"))))
       (message "Opening file %s" f)
-      (org-open-file f)
+      (org-open-file f 'system)
       (when org-export-kill-product-buffer-when-displayed
 	(kill-buffer (current-buffer))))))
 
@@ -509,7 +509,7 @@ This is a helper routine for interactive use."
       (message "Exported to %s" out-file)
       (when prefix-arg
 	(message "Opening %s..."  out-file)
-	(org-open-file out-file))
+	(org-open-file out-file 'system))
       out-file)
      (t
       (message "Export to %s failed" out-file)
diff --git a/lisp/org-odt.el b/lisp/org-odt.el
index c80821fb7..fbb31d516 100644
--- a/lisp/org-odt.el
+++ b/lisp/org-odt.el
@@ -243,9 +243,6 @@ standard Emacs.")
 
 (mapc
  (lambda (desc)
-   ;; Let Org open all OpenDocument files using system-registered app
-   (add-to-list 'org-file-apps
-		(cons (concat  "\\." (car desc) "\\'") 'system))
    ;; Let Emacs open all OpenDocument files in archive mode
    (add-to-list 'auto-mode-alist
 		(cons (concat  "\\." (car desc) "\\'") 'archive-mode)))