2 files changed, 4 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6e13e1e836d..dc9f6f83c5d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-08  Glenn Morris  <rgm@gnu.org>
 
+        * net/browse-url.el (browse-url-firefox):
+        Test system-type, not system-configuration.
+
         * vc/log-edit.el (log-edit-empty-buffer-p): New function.
         (log-edit-insert-cvs-template, log-edit-insert-cvs-rcstemplate):
         Use log-edit-empty-buffer-p.  (Bug#7598)
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 24dbfc0c30a..8f91fbb26b1 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -1111,8 +1111,7 @@ URL in a new window."
                  browse-url-firefox-program
                  (append
                   browse-url-firefox-arguments
-                  (if (or (featurep 'dos-w32)
-                          (string-match "win32" system-configuration))
+                  (if (memq system-type '(windows-nt ms-dos))
                       (list url)
                     (list "-remote"
                           (concat "openURL("