diff --git a/yard/scripts/make_debian b/yard/scripts/make_debian
index 29f8f15..e9bc2e1 100755
--- a/yard/scripts/make_debian
+++ b/yard/scripts/make_debian
@@ -20,6 +20,8 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+use File::Basename;
+
 # You will need to get swim at http://www.sourceforge.net/projects/avd
 my $home = "$ENV{HOME}/.gbootroot";
 my $home_yard = "$home/yard";
@@ -124,6 +126,7 @@ foreach (@alternatives) {
     if ($alternatives{$_}) {
 	print DEBIAN "/etc/alternatives/", $alternatives{$_}, "\n";
 	print DEBIAN "/var/lib/dpkg/alternatives/", $alternatives{$_}, "\n";
+	print DEBIAN dirname($_), "/", $alternatives{$_}, "\n";
     }
 }
 
diff --git a/yard/templates/Debian.yard b/yard/templates/Debian.yard
index f520178..dca9c27 100644
--- a/yard/templates/Debian.yard
+++ b/yard/templates/Debian.yard
@@ -4044,15 +4044,22 @@
 # Alternative stuff.
 /etc/alternatives/nawk
 /var/lib/dpkg/alternatives/nawk
+/usr/bin/nawk
 /etc/alternatives/w
 /var/lib/dpkg/alternatives/w
+/usr/bin/w
 /etc/alternatives/vi
 /var/lib/dpkg/alternatives/vi
+/usr/bin/vi
 /etc/alternatives/ex
 /var/lib/dpkg/alternatives/ex
+/usr/bin/ex
 /etc/alternatives/view
 /var/lib/dpkg/alternatives/view
+/usr/bin/view
 /etc/alternatives/pager
 /var/lib/dpkg/alternatives/pager
+/usr/bin/pager
 /etc/alternatives/ipfwadm
 /var/lib/dpkg/alternatives/ipfwadm
+/sbin/ipfwadm