diff --git a/src/CHANGELOG b/src/CHANGELOG
index caf255d3d..338297e57 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -43,6 +43,8 @@ ECL 0.9g
    to load files with strange extensions (.fas, .fasl, etc) as binary files and
    only if this fails, use the source-file loader.
 
+ - .LSP/.LISP are now recognized lisp source extensions.
+
 * Errors fixed:
 
  - Now .o files compiled with :SYSTEM-P T with dash in filename load
diff --git a/src/cmp/cmpmain.lsp b/src/cmp/cmpmain.lsp
index 023ec7328..5033bf693 100644
--- a/src/cmp/cmpmain.lsp
+++ b/src/cmp/cmpmain.lsp
@@ -400,13 +400,11 @@ static cl_object VV[VM];
 
   (setq *compile-file-pathname* input-pathname)
   (unless (probe-file *compile-file-pathname*)
-    (setq *compile-file-pathname* (make-pathname :type "lsp" :defaults input-pathname))
-    (unless (probe-file *compile-file-pathname*)
-      (setq *compile-file-pathname* (make-pathname :type "lisp" :defaults input-pathname))
-      (unless (probe-file *compile-file-pathname*)
-	(setq *compile-file-pathname* (make-pathname :type NIL :defaults input-pathname))
-	(unless (probe-file *compile-file-pathname*)
-	  (error 'file-error :pathname input-pathname)))))
+    (dolist (ext '("lsp" "LSP" "lisp" "LISP")
+	     (error 'file-error :pathname input-pathname))
+      (setq *compile-file-pathname* (make-pathname :type exit :defaults input-pathname))
+      (when (probe-file *compile-file-pathname*)
+	(return))))
   (setq *compile-file-truename* (truename *compile-file-pathname*))
 
   #+PDE (setq sys:*source-pathname* *compile-file-truename*)