diff --git a/win32utils/makedefs.pl b/win32utils/makedefs.pl
index ee3d733ccd..b3ba6f2d65 100644
--- a/win32utils/makedefs.pl
+++ b/win32utils/makedefs.pl
@@ -15,11 +15,11 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: makedefs.pl,v 1.2 2001/07/22 05:55:38 mayer Exp $ 
+# $Id: makedefs.pl,v 1.3 2001/07/27 05:20:28 mayer Exp $ 
 #
 # makedefs.pl
-# This script goes through all of the lib header files and creates a .def file for
-# each DLL for Win32. It recurses as necessary through the subdirectories
+# This script goes through all of the lib header files and creates a .def file
+# for each DLL for Win32. It recurses as necessary through the subdirectories
 #
 # This program should only be run if it is necessary to regenerate
 # the .def files.  Normally these files should be updated by  hand, adding
@@ -101,9 +101,8 @@ $xdir = $_[0];
 #
 #^(([_a-z0-9])*( ))*prefix_[_a-z]+_[a-z]+( )*\(
 $prefix = $_[1];
-#$pattern = "\^\( \)\*$prefix\_\[\_a\-z\]\+_\[a\-z\]\+\( \)\*\\\(";
-#$pattern = "\^\(\(\[\_a\-z0\-9\]\)\*\( \)\)\*$prefix\_\[\_a\-z0\-9\]\+_\[a\-z0\-9\]\+\( \)\*\\\(";
-$pattern = "\^\(\(\[\_a\-z0\-9\]\)\*\( \)\)\*\(\\*\( \)\+\)\*$prefix\_\[\_a\-z0\-9\]\+_\[a\-z0\-9\]\+\( \)\*\\\(";
+$pattern = "\^\(\(\[\_a\-z0\-9\]\)\*\( \)\)\*\(\\*\( \)\+\)\*$prefix";
+$pattern = "$pattern\_\[\_a\-z0\-9\]\+_\[a\-z0\-9\]\+\( \)\*\\\(";
 
 opendir(DIR,$xdir) || die "No Directory: $!";
 @files = grep(/\.h$/i, readdir(DIR));
@@ -113,7 +112,8 @@ foreach $filename (sort @files) {
 #
 # Open the file and locate the pattern.
 #
-	open (HFILE, "$xdir/$filename") || die "Can't open file $filename : $!";
+	open (HFILE, "$xdir/$filename") ||
+              die "Can't open file $filename : $!";
 #
 	while (<HFILE>) {
 		if(/$pattern/) {
@@ -121,7 +121,7 @@ foreach $filename (sort @files) {
 			chop($func);
 			$space = rindex($func, " ") + 1;
 			if($space >= 0) {
-				#strip out return values
+				# strip out return values
 				$func = substr($func, $space, 100);
 			}
 			print OUTDEFFILE "$func\n";
diff --git a/win32utils/makeversion.pl b/win32utils/makeversion.pl
index d6f2ea92a2..447c01a2f7 100644
--- a/win32utils/makeversion.pl
+++ b/win32utils/makeversion.pl
@@ -15,12 +15,12 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: makeversion.pl,v 1.2 2001/07/22 05:55:39 mayer Exp $ 
+# $Id: makeversion.pl,v 1.3 2001/07/27 05:20:29 mayer Exp $ 
 
-# This script takes the version information from the version file located at the
-# root of the source tree and the api files in each library directory and writes
-# the resulting information into a version.h file that the build process uses to
-# build the executable code.
+# This script takes the version information from the version file located
+# at the root of the source tree and the api files in each library directory
+# and writes the resulting information into a version.h file that the build
+# process uses to build the executable code.
 # This program was written by PDM. danny.mayer@nominum.com 1-Jul-2001.
 #
 # List of directories with version files
@@ -53,7 +53,8 @@ close(VERSIONFILE);
 # Now set up the output version file
 
 $ThisDate = scalar localtime();
-open (OUTVERSIONFILE, ">$versionpath") || die "Can't open output file $versionpath: $!";
+open (OUTVERSIONFILE, ">$versionpath") ||
+      die "Can't open output file $versionpath: $!";
 
 #Standard Header
 
@@ -77,7 +78,8 @@ print OUTVERSIONFILE '/*
 ';
 
 print OUTVERSIONFILE "/*\n";
-print OUTVERSIONFILE " * $versionfile.  Generated automatically by makeversion.pl.\n";
+print OUTVERSIONFILE " * $versionfile.";
+print OUTVERSIONFILE "  Generated automatically by makeversion.pl.\n";
 print OUTVERSIONFILE " * Date generated: $ThisDate\n";
 print OUTVERSIONFILE " */\n\n";
 
@@ -87,7 +89,8 @@ print OUTVERSIONFILE '
 
 ';
 
-$Version = "$Versions{'MAJORVER'}.$Versions{'MINORVER'}.$Versions{'PATCHVER'}$Versions{'RELEASETYPE'}$Versions{'RELEASEVER'}";
+$Version = "$Versions{'MAJORVER'}.$Versions{'MINORVER'}.$Versions{'PATCHVER'}";
+$Version = "$Version$Versions{'RELEASETYPE'}$Versions{'RELEASEVER'}";
 print "BIND Version: $Version\n";
 
 print OUTVERSIONFILE "#define VERSION \"$Version\"\n\n";