diff --git a/config.lisp b/config.lisp
index 669fea05addd0aa4736fdef4f01f1a0865f72af6..ccd8c46d51d3447904b7beeaebb16942e9de58ca 100644
--- a/config.lisp
+++ b/config.lisp
@@ -92,9 +92,16 @@
   by the browser specified in *web-browser* below")
 
 (defparameter *web-browser*
-  #+:able-windows "C:/Progra~1/Intern~1/iexplore.exe"
-  #+:able-linux "/usr/bin/firefox"
-  #+:able-macosx "open")
+  (first
+   (list
+    #+(or (and :clisp :win32) (and :sbcl :win32) (and :ccl :windows))
+    "C:/Progra~1/Intern~1/iexplore.exe"
+    #+(or (and :clisp :unix (not :macos)) (and :sbcl :linux) (and :ccl :linux))
+    "/usr/bin/firefox"
+    #+(or (and :ccl :darwin) (and :clisp :macos) (and :sbcl :darwin))
+    "open"
+    ;; default
+    "firefox")))
 
 (defparameter *user-load-paths* nil
   "A list of additional user specified places to find systems")
diff --git a/defpackage.lisp b/defpackage.lisp
index 711164f0e36c5a6e2d923986fe543175be5a8fc6..419e90ea5a1fbbaedc6884192b9b8e2bc213b54d 100644
--- a/defpackage.lisp
+++ b/defpackage.lisp
@@ -10,22 +10,3 @@
 
 ;;; SBCL needs to load it's introspection library.
 #+:sbcl (require :sb-introspect)
-
-;;; Operating system detection.
-#+(or (and :clisp :win32) (and :sbcl :win32) (and :ccl :windows))
-  (push :able-windows *features*)
-#+(or (and :clisp :unix (not :macos)) (and :sbcl :linux) (and :ccl :linux))
-  (push :able-linux *features*)
-#+(or (and :ccl :darwin) (and :clisp :macos) (and :sbcl :darwin))
-  (push :able-macosx *features*)
-
-
-
-
-
-
-
-
-
-
-