diff --git a/data/cgi/url.cgi b/data/cgi/url.cgi
index 37ce1f5d0e..fd34c280ce 100755
--- a/data/cgi/url.cgi
+++ b/data/cgi/url.cgi
@@ -4,7 +4,7 @@
 #
 # url.cgi - make plain text URLs clickable
 #
-# $Id: url.cgi,v 1.1 1997-10-11 15:58:11 wosch Exp $
+# $Id: url.cgi,v 1.2 1997-11-04 13:00:05 wosch Exp $
 
 PATH=/bin:/usr/bin:/usr/local/bin; export PATH
 
@@ -22,7 +22,7 @@ then
     printf "Content-type: text/html\n\n<HTML><BODY><pre>\n"
     lynx -source "$url" | 
 	perl -npe 's/</&lt;/g;
-    s%(http://[^\s"]+)%<A HREF="$1">$1</A>%g;
+    s%(http://[^\s"\)\>,;]+)%<A HREF="$1">$1</A>%g;
     s%([\w\-\.]+\@[\w\-\.]+\.[a-z]+)%<A HREF="mailto:$1">$1</A>%g;'
 
     echo "</pre></BODY></HTML>"	
diff --git a/en/cgi/url.cgi b/en/cgi/url.cgi
index 37ce1f5d0e..fd34c280ce 100755
--- a/en/cgi/url.cgi
+++ b/en/cgi/url.cgi
@@ -4,7 +4,7 @@
 #
 # url.cgi - make plain text URLs clickable
 #
-# $Id: url.cgi,v 1.1 1997-10-11 15:58:11 wosch Exp $
+# $Id: url.cgi,v 1.2 1997-11-04 13:00:05 wosch Exp $
 
 PATH=/bin:/usr/bin:/usr/local/bin; export PATH
 
@@ -22,7 +22,7 @@ then
     printf "Content-type: text/html\n\n<HTML><BODY><pre>\n"
     lynx -source "$url" | 
 	perl -npe 's/</&lt;/g;
-    s%(http://[^\s"]+)%<A HREF="$1">$1</A>%g;
+    s%(http://[^\s"\)\>,;]+)%<A HREF="$1">$1</A>%g;
     s%([\w\-\.]+\@[\w\-\.]+\.[a-z]+)%<A HREF="mailto:$1">$1</A>%g;'
 
     echo "</pre></BODY></HTML>"	
