diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 586ad98f0..7f22932ed 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-02  Bastien Guerry  <bzg@altern.org>
+
+	* org-exp.el (org-export-as-org): Use file-source.org format
+	instead of file.org-source.
+
 2009-07-31  Bastien Guerry  <bzg@altern.org>
 
 	* org.el (org-make-link-regexps): Don't exclude parentheses from
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 280b1f4e8..dd373cf82 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -2498,12 +2498,11 @@ directory."
 			    (or pub-dir
 				(org-export-directory :org opt-plist)))
 			   (file-name-sans-extension
-			    (file-name-nondirectory bfname))
-			     ".org"))
+			    (file-name-nondirectory bfname))))
 	 (filename (and filename
 			(if (equal (file-truename filename)
 				   (file-truename bfname))
-			    (concat filename "-source")
+			    (concat filename "-source.org")
 			  filename)))
 	 (backup-inhibited t)
 	 (buffer (find-file-noselect filename))