--- TWiki.pm_orig	Fri Jul 30 04:16:34 2004
+++ TWiki.pm	Fri Jul 30 05:06:35 2004
@@ -2933,11 +2933,11 @@
     my $verbatimCount = $#{$verbatim} + 1;
     
     foreach( split( /\n/, $intext ) ) {
-        if( /^(\s*)<verbatim>\s*$/i ) {
+        if( /^(\s*)<verbatim>(.*)$/i ) {
             $nesting++;
             if( $nesting == 1 ) {
                 $outtext .= "$1%_VERBATIM$verbatimCount%\n";
-                $tmp = "";
+                $tmp = "$2";
                 next;
             }
         } elsif( m|^\s*</verbatim>\s*$|i ) {
@@ -2984,7 +2984,7 @@
         my $val = $verbatim[$i];
         if( $type ne "verbatim" ) {
             $val =~ s/</&lt;/g;
-            $val =~ s/</&gt;/g;
+            $val =~ s/>/&gt;/g;
             $val =~ s/\t/   /g; # A shame to do this, but been in TWiki.org have converted
                                 # 3 spaces to tabs since day 1
         }