diff --git a/add-ons/yard/make-debian-X11/make_debian-X11 b/add-ons/yard/make-debian-X11/make_debian-X11
index a3fcd38..7aa7639 100755
--- a/add-ons/yard/make-debian-X11/make_debian-X11
+++ b/add-ons/yard/make-debian-X11/make_debian-X11
@@ -372,6 +372,7 @@ while (<STDIN>) {
     }
 }
 
+system "rm -f $template_dir/$debian_yard";
 open(DEBIAN,">$template_dir/$debian_yard") 
 	or die "Couldn't open $template_dir$debian_yard: $!\n";
 open(FILERC,"/etc/runlevel.conf") or die "No runlevel.conf: $!\n";
@@ -737,7 +738,7 @@ sub start_up {
     }
 
     # Swim has been installed but is removed or purged
-    my $dpkg_s = "dpkg -s swim|";
+    my $dpkg_s = "dpkg -s dswim|";
     open(DPKG,"$dpkg_s") or die "Couldn't find dpkg: $!\n";
     while (<DPKG>) {
 	if (/Status:/) {
diff --git a/yard/scripts/make_debian b/yard/scripts/make_debian
index edd3f2f..d3f2ece 100755
--- a/yard/scripts/make_debian
+++ b/yard/scripts/make_debian
@@ -341,6 +341,7 @@ while (<STDIN>) {
     }
 }
 
+system "rm -f $template_dir/$debian_yard";
 open(DEBIAN,">$template_dir/$debian_yard") 
 	or die "Couldn't open $template_dir$debian_yard: $!\n";
 open(FILERC,"/etc/runlevel.conf") or die "No runlevel.conf: $!\n";
@@ -662,7 +663,7 @@ sub start_up {
     }
 
     # Swim has been installed but is removed or purged
-    my $dpkg_s = "dpkg -s swim|";
+    my $dpkg_s = "dpkg -s dswim|";
     open(DPKG,"$dpkg_s") or die "Couldn't find dpkg: $!\n";
     while (<DPKG>) {
 	if (/Status:/) {