diff --git a/CGI.pm b/CGI.pm
index 3e07b71a..b9f09306 100644
--- a/CGI.pm
+++ b/CGI.pm
@@ -18,8 +18,8 @@ use Carp 'croak';
 # The most recent version and complete docs are available at:
 #   http://stein.cshl.org/WWW/software/CGI/
 
-$CGI::revision = '$Id: CGI.pm,v 1.150 2004-01-12 23:37:35 lstein Exp $';
-$CGI::VERSION=3.02;
+$CGI::revision = '$Id: CGI.pm,v 1.151 2004-01-13 16:28:35 lstein Exp $';
+$CGI::VERSION=3.03;
 
 # HARD-CODED LOCATION FOR FILE UPLOAD TEMPORARY FILES.
 # UNCOMMENT THIS ONLY IF YOU KNOW WHAT YOU'RE DOING.
@@ -2548,8 +2548,8 @@ sub url {
         $script_name =~ s/\?.+$//;   # strip query string
         # and path
         if (exists($ENV{PATH_INFO})) {
-           my $encoded_path = quotemeta($ENV{PATH_INFO});
-           $script_name      =~ s/$encoded_path$//i;
+           my $encoded_path = unescape($ENV{PATH_INFO});
+           $script_name      =~ s/\Q$encoded_path\E$//i;
          }
     }
 
diff --git a/CGI/Fast.pm b/CGI/Fast.pm
index 669b38e0..43b8709a 100644
--- a/CGI/Fast.pm
+++ b/CGI/Fast.pm
@@ -16,7 +16,7 @@ package CGI::Fast;
 # The most recent version and complete docs are available at:
 #   http://www.genome.wi.mit.edu/ftp/pub/software/WWW/cgi_docs.html
 #   ftp://ftp-genome.wi.mit.edu/pub/software/WWW/
-$CGI::Fast::VERSION='1.04';
+$CGI::Fast::VERSION='1.05';
 
 use CGI;
 use FCGI;
diff --git a/CGI/Util.pm b/CGI/Util.pm
index 7c7b08f1..be104fac 100644
--- a/CGI/Util.pm
+++ b/CGI/Util.pm
@@ -7,7 +7,7 @@ require Exporter;
 @EXPORT_OK = qw(rearrange make_attributes unescape escape 
 		expires ebcdic2ascii ascii2ebcdic);
 
-$VERSION = '1.3';
+$VERSION = '1.4';
 
 $EBCDIC = "\t" ne "\011";
 if ($EBCDIC) {
diff --git a/cgi_docs.html b/cgi_docs.html
index 0c03c1d9..e7e53c0e 100644
--- a/cgi_docs.html
+++ b/cgi_docs.html
@@ -7,7 +7,7 @@
 <BODY bgcolor="#FFFFFF">
 <H1><IMG SRC="examples/dna.small.gif" ALT="[logo]">
 CGI.pm - a Perl5 CGI Library</H1>
-Version 3.03, XX/XX/XXXX, L. Stein
+Version 3.03, 01/13/2004, L. Stein
 <p>
 
 <H2>Abstract</H2> This perl 5 library uses objects to create Web
@@ -4860,7 +4860,9 @@ <H2><a name="bugs">Bug Reports</a></H2>
 
 <H2><A NAME="new">Revision History</A></H2>
 <h3>Version 3.03</h3>
-<li>Fix upload hook functionality
+    <li>Fix upload hook functionality
+    <li>Workaround for CGI->unescape_html()
+    <li>Bumped version numbers in CGI::Fast and CGI::Util for 5.8.3-tobe
 </h3>
 
 <h3>Version 3.02</h3>
@@ -5986,6 +5988,6 @@ <H3>Bug fixes</H3>
 <a href="http://www.cshl.org/">Cold Spring Harbor Laboratory</a></ADDRESS>
 <P>
 <!-- hhmts start -->
-Last modified: Tue Dec 16 15:47:41 EST 2003
+Last modified: Tue Jan 13 11:29:38 EST 2004
 <!-- hhmts end -->
 </BODY> </HTML>
