diff --git a/asdf.lisp b/asdf.lisp
index cf6399d5f83db3c26d41926b24a8177f9dac0c56..c1104e59b65a40039105337310a8307422330c5c 100644
--- a/asdf.lisp
+++ b/asdf.lisp
@@ -133,7 +133,7 @@
 	   #:*include-per-user-information*
 	   #:*map-all-source-files*
 	   #:output-files-for-system-and-operation
-	   #:*place-binaries-in-implementation-specific-directories*
+	   #:*enable-asdf-binary-locations*
 	   #:implementation-specific-directory-name)
   (:use :cl))
 
@@ -630,13 +630,13 @@ actually-existing directory."
 					 (make-pathname
 					  :defaults defaults :version :newest
 					  :name name :type "asd" :case :local)))
-                               #+(or win32 windows)
+                               #+(and (or win32 windows) (not :clisp))
                                (shortcut (make-pathname
                                           :defaults defaults :version :newest
                                           :name name :type "asd.lnk" :case :local)))
 			  (if (and file (probe-file file))
 			      (return file))
-                          #+(or win32 windows)
+                          #+(and (or win32 windows) (not :clisp))
                           (when (probe-file shortcut)
                             (let ((target (parse-windows-shortcut shortcut)))
                               (when target
@@ -1628,7 +1628,7 @@ If true, compiled lisp files without an explicit mapping (see
 without an explicitly mapping will be placed in subdirectories of
 their sources.")
 
-(defparameter *place-binaries-in-implementation-specific-directories* nil
+(defparameter *enable-asdf-binary-locations* nil
   "
 If true, then compiled lisp files will be placed into a directory 
 computed from the Lisp version, Operating System and computer archetecture.
@@ -1726,7 +1726,7 @@ See [implementation-specific-directory-name][] for details.")
   "Return a name that can be used as a directory name that is
 unique to a Lisp implementation, Lisp implementation version,
 operating system, and hardware architecture."
-  (and *place-binaries-in-implementation-specific-directories*
+  (and *enable-asdf-binary-locations*
        (list 
 	(or *implementation-specific-directory-name*
 	    (setf *implementation-specific-directory-name*
diff --git a/website/source/getting-started.mmd b/website/source/getting-started.mmd
index abeb9bdad3becc9198724059df57623128e30b62..b4b16b13cd7cbc6d16ccd2cdbe272f22b18613e1 100644
--- a/website/source/getting-started.mmd
+++ b/website/source/getting-started.mmd
@@ -118,7 +118,7 @@ If you want to keep `FASL` files out of source tree entirely \*centralize-lisp-b
  
 Here is a summary of the variables that control ASDF's source-to-binary mappings: 
 
-  * \*place-binaries-in-implementation-specific-directories\*:
+  * \*enable-asdf-binary-locations\*:
     If false, then ASDF will place binaries in the same
     directory as the source. If true, then ASDF will move the
     binaries using the rest of the configuration. Defaults to
diff --git a/website/source/manual.mmd b/website/source/manual.mmd
index f99ce7de3d4ce92c9b1e3676ccdb296a29674508..4ed2fd8b67211135be38c09f5efe863ca58ce027 100644
--- a/website/source/manual.mmd
+++ b/website/source/manual.mmd
@@ -809,7 +809,7 @@ ASDF includes code to control where the binaries files are places. The location
 
 {docs *map-all-source-files*}
 
-{docs *place-binaries-in-implementation-specific-directories*}
+{docs *enable-asdf-binary-locations*}
 
 {docs *source-to-target-mappings*}