diff --git a/mvwrap/mvwrap b/mvwrap/mvwrap
index 53ae6cb..ce7dcd2 100755
--- a/mvwrap/mvwrap
+++ b/mvwrap/mvwrap
@@ -104,7 +104,7 @@ sub move_files {
 		chomp($target);
 		unless ( $source eq $target ) {
 			if ($opt_v||$opt_n) {
-				print "mv $source $target\n";
+				print "mv \"$source\" \"$target\"\n";
 			}
 			unless ($opt_n) {
 				move("$source", "$target")
@@ -206,7 +206,7 @@ sub safety_belt {
 		chomp $filename;
 		$rand = &rand_file;
 		if ($opt_v||$opt_n) {
-			print "mv $filename $rand\n";
+			print "mv \"$filename\" \"$rand\"\n";
 		}
 		unless ($opt_n) {
 			move("$filename", "$rand")