--- Manip.pm.orig    Wed Jun 14 15:40:26 2000
+++ Manip.pm         Mon Nov 12 00:29:08 2001
@@ -3355,15 +3355,10 @@
     }
 
     # Handle STD#DST# format (and STD-#DST-# formats)
-    if ($tz =~ /^([a-z]+)-?\d([a-z]+)-?\d?$/i) {
+    if ($tz =~ /^([a-z]+)[+-]?\d+(?::\d+)?([a-z]+)?/i) {
       ($std,$dst)=($1,$2);
-      next  if (! defined $Zone{"n2o"}{lc($std)} or
-                ! defined $Zone{"n2o"}{lc($dst)});
-      $time = time();
-      ($null,$null,$null,$null,$null,$null,$null,$null,$isdst) =
-        localtime($time);
-      return uc($dst)  if ($isdst);
-      return uc($std);
+      return uc($dst) if ( $dst && defined $Zone{"n2o"}{lc($dst)} && (localtime(time))[8] );
+      return uc($std) if ( defined $Zone{"n2o"}{lc($std)} );
     }
   }