diff --git a/src/ChangeLog b/src/ChangeLog
index d4cb88a9..5d1390c0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-02  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* url.c (rewrite_shorthand_url): Only accept recognized schemes.
+	That way "foo:80" will correctly be rewritten to "http://foo:80"
+	instead of left unchanged and ultimately rejected because of
+	"unsupported scheme foo".
+
 2005-03-31  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* utils.c (number_to_string): Avoid explicit 64-bit constants;
diff --git a/src/url.c b/src/url.c
index 041001ad..82b4bcea 100644
--- a/src/url.c
+++ b/src/url.c
@@ -544,7 +544,7 @@ rewrite_shorthand_url (const char *url)
 {
   const char *p;
 
-  if (url_has_scheme (url))
+  if (url_scheme (url) != SCHEME_INVALID)
     return NULL;
 
   /* Look for a ':' or '/'.  The former signifies NcFTP syntax, the