diff --git a/ms-windows/osgeo4w/creatensis.pl b/ms-windows/osgeo4w/creatensis.pl
index 3b9eb64b250..39bf9d43082 100755
--- a/ms-windows/osgeo4w/creatensis.pl
+++ b/ms-windows/osgeo4w/creatensis.pl
@@ -166,9 +166,9 @@ foreach my $p ( keys %pkgs ) {
 
 		if( exists $md5{$file} ) {
 			my $md5;
-			open F, "md5sum $file|";
+			open F, "md5sum '$file'|";
 			while(<F>) {
-				if( /^(\S+)\s+\*?$file$/ ) {
+				if( /^(\S+)\s+\*?(.*)$/ && $2 eq $file ) {
 					$md5 = $1;
 				}
 			}