diff --git a/src/CHANGELOG b/src/CHANGELOG
index 1497e39b9..f0bfdcb46 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -234,6 +234,9 @@ ECL 0.9k:
  - Garbage collection statistics was broken for libraries other than the one
    shipped with ECL.
 
+ - When COMPILE-FILE is provided a value of :OUTPUT-FILE, the file extension
+   ".fas" was not automatically appended.
+
 * Optimization and performance:
 
  - TYPEP now can be optimized if the type argument is a constant.
diff --git a/src/cmp/cmpmain.lsp b/src/cmp/cmpmain.lsp
index 1acde5164..62f164450 100644
--- a/src/cmp/cmpmain.lsp
+++ b/src/cmp/cmpmain.lsp
@@ -500,7 +500,8 @@ static cl_object VV[VM];
   (setq *compile-file-truename* (truename *compile-file-pathname*))
 
   (when (eq output-file 'T)
-    (setf output-file (compile-file-pathname *compile-file-truename* :type (if system-p :object :fasl))))
+    (setf output-file *compile-file-truename*))
+  (setf output-file (compile-file-pathname output-file :type (if system-p :object :fasl)))
 
   #+PDE (setq sys:*source-pathname* *compile-file-truename*)
 
diff --git a/src/lsp/config.lsp.in b/src/lsp/config.lsp.in
index 3efab08b1..57599431c 100644
--- a/src/lsp/config.lsp.in
+++ b/src/lsp/config.lsp.in
@@ -46,15 +46,7 @@ Returns, as a string, the location of the machine on which ECL runs."
 (defun lisp-implementation-version ()
   "Args:()
 Returns the version of your ECL as a string."
-<<<<<<< HEAD:src/lsp/config.lsp.in
-<<<<<<< HEAD:src/lsp/config.lsp.in
-  "@PACKAGE_VERSION@ (CVS 2008-05-29 20:53)")
-=======
-  "@PACKAGE_VERSION@ (CVS 2008-05-30 15:21)")
->>>>>>> 510929fe4fe845e539f661d00860e084248060a4:src/lsp/config.lsp.in
-=======
-  "@PACKAGE_VERSION@ (CVS 2008-05-30 19:03)")
->>>>>>> 263c837285a673bf4d38ad60aab4a8d59443a475:src/lsp/config.lsp.in
+  "@PACKAGE_VERSION@ (CVS 2008-05-31 01:49)")
 
 (defun machine-type ()
   "Args: ()