diff --git a/mvwrap/mvwrap b/mvwrap/mvwrap
index e2417ce..f517c41 100755
--- a/mvwrap/mvwrap
+++ b/mvwrap/mvwrap
@@ -53,7 +53,7 @@ sub read_cur_dir {
 	my (@dir, $filename);
 	opendir(DIRHANDLE, ".") or die "couldn't open .: $!";
 	while ( defined ($filename = readdir(DIRHANDLE)) ) {
-		unless ($filename eq "." | $filename eq "..") {
+		unless (chomp($filename) eq "." | chomp($filename) eq "..") {
 			push @dir, "$filename\n";
 		}
 	}
@@ -220,7 +220,7 @@ sub paranoia {
 	foreach $ctarget (@$target) {
 		$safe = 0;
 		foreach $csource (@$source) {
-			if ($ctarget eq $csource) { $safe = 1; }
+			if (chomp($ctarget) eq chomp($csource)) { $safe = 1; }
 		}
 		chomp $ctarget;
 		if (! $safe && -e $ctarget) { die "That would overwrite files\n"; }