diff --git a/add-ons/yard/make-debian-X11/make_debian-X11 b/add-ons/yard/make-debian-X11/make_debian-X11
index da44482..e205cab 100755
--- a/add-ons/yard/make-debian-X11/make_debian-X11
+++ b/add-ons/yard/make-debian-X11/make_debian-X11
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-#    make_debian Copyright (C) 2001 from gBootRoot
+#    make_debian-X11 Copyright (C) 2001 from gBootRoot
 #    Lead Developer and Project Coordinator
 #    Jonathan Rosenbaum <freesource@users.sourceforge.net>
 #
@@ -149,7 +149,7 @@ my $stuff = << "STUFF";
 # Todays Quote: Creating a root filesystem is all about stuff.
 
 # The STUFF NEEDED in order for init to work.
-/etc/runlevel.conf <=  Replacements/etc/runlevel.conf # made by make_debian
+/etc/runlevel.conf <=  Replacements/etc/runlevel.conf_debian-X11 # made by make_debian-X11
 /etc/init.d/rc
 /etc/init.d/rcS
 /etc/inittab <= Replacements/etc/inittab.debian # specific to devfs
@@ -181,10 +181,10 @@ my $stuff = << "STUFF";
 /etc/shadow <= Replacements/etc/shadow.debian
 
 # The stuff required by dpkg.
-/var/lib/dpkg/diversions <= Replacements/var/lib/dpkg/diversions
+/var/lib/dpkg/diversions <= Replacements/var/lib/dpkg/diversions_debian-X11
 /var/lib/dpkg/cmethopt
 /var/lib/dpkg/lock
-/var/lib/dpkg/status <=  Replacements/var/lib/dpkg/status
+/var/lib/dpkg/status <=  Replacements/var/lib/dpkg/status_debian-X11
 /var/lib/dpkg/methods/disk
 /var/lib/dpkg/methods/floppy
 /var/lib/dpkg/methods/mnt
@@ -210,7 +210,7 @@ my $stuff = << "STUFF";
 /etc/default/ipchains
 
 # Netkit-inetd stuff
-/etc/inetd.conf <= Replacements/etc/inetd.conf
+/etc/inetd.conf <= Replacements/etc/inetd.conf_debian-X11
 
 # Tcpd stuff
 /etc/hosts.allow
@@ -289,7 +289,7 @@ my $stuff = << "STUFF";
 /var/lib/locate
 /var/backups
 
-# Stuff so ldconfig doesn't complain.
+# Stuff so ldconfig creates all the proper dependencies.
 /etc/ld.so.conf <= Replacements/etc/ld.so.conf
 
 ## ALL the REQUIRED files generated by make-debian.
@@ -470,8 +470,8 @@ print STDERR "All done making your $debian_yard template.\n";
 # This creates a tweaked runlevel.conf which is easier then trying to figure
 # out which symlinks to use in /etc/rc?d.
 
-open(MY_FILERC,">$home_yard_replacements/etc/runlevel.conf") 
-    or die "Couldn't open $home_yard_replacements/etc/runlevel.conf: $!\n"; 
+open(MY_FILERC,">$home_yard_replacements/etc/runlevel.conf_debian-X11") 
+    or die "Couldn't open $home_yard_replacements/etc/runlevel.conf_debian-X11: $!\n"; 
 my @sortedrc = map { $_->[1] }
 sort { $a->[0] <=> $b->[0] }
 map { [ (split(/\s/,$_))[0], $_ ] }
@@ -503,8 +503,8 @@ open(STATUS,"$status") or die "Can't find /var/lib/dpkg/status: $!\n";
 home_builder("$home_yard_replacements/var/lib/dpkg");
 system "touch $home_yard_replacements/var/lib/dpkg/available";
     #or die "Couldn't create Replacements/var/lib/dpkg/available: $!\n";
-open(NEW_STATUS,">$home_yard_replacements/var/lib/dpkg/status")
-    or die "Couldn't open $home_yard_replacements/var/lib/dpkg/status: $!\n";
+open(NEW_STATUS,">$home_yard_replacements/var/lib/dpkg/status_debian-X11")
+    or die "Couldn't open Replacements/var/lib/dpkg/status_debian-X11: $!\n";
 while (<STATUS>) { # keep the order
     my $stat = $_;
     my $stat2 = (split(/\n/,$stat))[0]; # might as well
@@ -539,8 +539,8 @@ while (<DIVERT>) {
 }
 close(DIVERT) or die "Couldn't close: $!\n";
 
-open(DIVERT,">$home_yard_replacements/var/lib/dpkg/diversions")
-    or die "Couldn't open Replacements/var/lib/dpkg/diversions: $!\n";
+open(DIVERT,">$home_yard_replacements/var/lib/dpkg/diversions_debian-X11")
+    or die "Couldn't open Replacements/var/lib/dpkg/diversions_debian-X11: $!\n";
 my @info;
 foreach my $rp (@required_packages) {
     $rp = (split(/_/,$rp))[0];
@@ -645,8 +645,8 @@ sub inetd_in {
 sub inetd_out {
 
     my $inetd = "/etc/inetd.conf";
-    open(REP_INETD,">$home_yard_replacements/etc/inetd.conf") 
-	or return "Couldn't open Replacements/etc/inetd.conf: $!\n";
+    open(REP_INETD,">$home_yard_replacements/etc/inetd.conf_debian-X11") 
+	or return "Couldn't open Replacements/etc/inetd.conf_debian-X11: $!\n";
     open(INETD,"$inetd") or return "Couldn't open /etc/inetd.conf: $!\n";
     while (<INETD>) {
 	if ( (split(/\s+/))[6] && !/^#.*/ ) {