diff --git a/add-ons/yard/make-debian-X11/make_debian-X11_pkg b/add-ons/yard/make-debian-X11/make_debian-X11_pkg
index c80cb52..8440f6b 100755
--- a/add-ons/yard/make-debian-X11/make_debian-X11_pkg
+++ b/add-ons/yard/make-debian-X11/make_debian-X11_pkg
@@ -23,7 +23,7 @@ use File::Find;
 # Makefile.pkg in $gbootroot_cvs in used as the packages Makefile.
 
 my $user_home = "/home/mttrader";
-my $prog = "make-debian-X11";
+my $prog = "make-debian-x11";
 my $prog_real_name = "make_debian-X11";
 my $revision = 1;
 my $dist = "unstable";
@@ -34,10 +34,11 @@ my $urgency = "low";
 my $gbootroot_cvs =  
     "$user_home/gbootroot/gbootroot/add-ons/yard/make-debian-X11";
 my $packaging_place = "$user_home/gbootroot/PACKAGING-debian-X11";
-my $packaging_defaults = "$gbootroot_cvs/add-ons/yard/make-debian-X11/pkg";
+my $packaging_defaults = 
+    "$gbootroot_cvs/add-ons/yard/make-debian-X11/pkg/dpkg";
 my $email = "freesource\@users.sourceforge.net";
 my $name = "Jonathan Rosenbaum";
-my $makefile = "Makefile";
+my $makefile = "Makefile.pkg";
 
 # Other vars
 my ($real_uid, $real_gid) = (stat($user_home))[4,5];
@@ -84,7 +85,7 @@ chomp $make_paragraph[1];
 my @make_lines = split(/\n/,$make_paragraph[1]);
 shift(@make_lines);
 
-chdir($gbootroot_cvs) or die "Couldn't change to $gbootroot_cvs: $?\n";
+chdir($gbootroot_cvs) or die "Couldn't change to $gbootroot_cvs: $!\n";
 
 # Basically we are just concerned with the first part of cp and will
 # use home_builder to make sure the directory exists.
@@ -132,14 +133,14 @@ if (-d $packaging_place) {
 
 # Now we to the dh_make thing, and setup the time, version, and defaults. 
 
-chdir($packaging_place) or die "Can't change to $packaging_place: $?\n";
+chdir($packaging_place) or die "Can't change to $packaging_place: $!\n";
 system "dh_make -e $email";
 
 # Here we ask the user what changes to add to the changelog and set the proper
 # time using 822-date.  If it is the initial release we don't do anything.
 
 open(CHANGELOG,"$packaging_defaults/changelog") 
-    or die "Couldn't open $packagaging_place/changelog: $?\n";
+    or die "Couldn't open $packaging_place/changelog: $!\n";
 my @changelog = <CHANGELOG>;
 close (CHANGELOG);
 
@@ -175,7 +176,7 @@ if (!$stop) {
     }
 
     open(CHANGELOG,">$packaging_defaults/changelog") 
-	or die "Couldn't open check: $?\n";
+	or die "Couldn't open check: $!\n";
     for my $ct (0 .. ($#changelog - 3)) {
 	print CHANGELOG $changelog[$ct];
     }			
@@ -195,7 +196,7 @@ system "chgrp $real_gid $packaging_defaults/changelog";
 
 # Set-up the copyright
 open(COPYRIGHT,">$packaging_defaults/copyright") 
-    or die "Couldn't open up $packaging_defaults/copyright: $?\n";
+    or die "Couldn't open up $packaging_defaults/copyright: $!\n";
 print COPYRIGHT "This package was debianized by $name\n";
 print COPYRIGHT "$email on " , `822-date`, ".\n";
 print COPYRIGHT "Author: \n$name <$email>\n\n";
diff --git a/gbootroot_pkg b/gbootroot_pkg
index aa69955..a955125 100755
--- a/gbootroot_pkg
+++ b/gbootroot_pkg
@@ -82,7 +82,7 @@ chomp $make_paragraph[1];
 my @make_lines = split(/\n/,$make_paragraph[1]);
 shift(@make_lines);
 
-chdir($gbootroot_cvs) or die "Couldn't change to $gbootroot_cvs: $?\n";
+chdir($gbootroot_cvs) or die "Couldn't change to $gbootroot_cvs: $!\n";
 
 # Basically we are just concerned with the first part of cp and will
 # use home_builder to make sure the directory exists.
@@ -130,14 +130,14 @@ if (-d $packaging_place) {
 
 # Now we to the dh_make thing, and setup the time, version, and defaults. 
 
-chdir($packaging_place) or die "Can't change to $packaging_place: $?\n";
+chdir($packaging_place) or die "Can't change to $packaging_place: $!\n";
 system "dh_make -e $email";
 
 # Here we ask the user what changes to add to the changelog and set the proper
 # time using 822-date.  If it is the initial release we don't do anything.
 
 open(CHANGELOG,"$packaging_defaults/changelog") 
-    or die "Couldn't open $packagaging_place/changelog: $?\n";
+    or die "Couldn't open $packaging_place/changelog: $!\n";
 my @changelog = <CHANGELOG>;
 close (CHANGELOG);
 
@@ -173,7 +173,7 @@ if (!$stop) {
     }
 
     open(CHANGELOG,">$packaging_defaults/changelog") 
-	or die "Couldn't open check: $?\n";
+	or die "Couldn't open check: $!\n";
     for my $ct (0 .. ($#changelog - 3)) {
 	print CHANGELOG $changelog[$ct];
     }			
@@ -193,7 +193,7 @@ system "chgrp $real_gid $packaging_defaults/changelog";
 
 # Set-up the copyright
 open(COPYRIGHT,">$packaging_defaults/copyright") 
-    or die "Couldn't open up $packaging_defaults/copyright: $?\n";
+    or die "Couldn't open up $packaging_defaults/copyright: $!\n";
 print COPYRIGHT "This package was debianized by $name\n";
 print COPYRIGHT "$email on " , `822-date`, ".\n";
 print COPYRIGHT "Author: \n$name <$email>\n\n";