diff --git a/scripts/nix-switch b/scripts/nix-switch
index 74bcef8566..aec61cbfe1 100755
--- a/scripts/nix-switch
+++ b/scripts/nix-switch
@@ -20,11 +20,17 @@ chomp $id;
 my $nr = 0;
 while (-e "$linkdir/$id-$nr") { $nr++; }
 my $link = "$linkdir/$id-$nr";
-print "$pkgdir\n";
 
 # Create a symlink from $link to $pkgdir.
 symlink($pkgdir, $link) or die "cannot create $link";
 
+# Also store the hash of $pkgdir.  This is useful for garbage
+# collection and the like.
+my $hashfile = "$linkdir/$id-$nr.hash";
+open HASH, "> $hashfile" or die "cannot create $hashfile";
+print HASH "$hash\n";
+close HASH;
+
 # Make $link the current generation by pointing $linkdir/current to
 # it.  The rename() system call is supposed to be essentially atomic
 # on Unix.  That is, if we have links `current -> X' and `new_current