diff --git a/debian/changelog b/debian/changelog
index dd15eae..a2c755d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bsdgames (2.17-2) unstable; urgency=low
+
+  * Rename fish to go-fish, since fish is also the command name of
+    the fish shell. Closes: #314460
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 17 Jun 2005 13:51:14 -0400
+
 bsdgames (2.17-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index f2520df..588d8fd 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Description: a collection of classic textual unix games
  been enjoyed for decades on unix systems.
  .
  Includes these programs: adventure, arithmetic, atc, backgammon, battlestar,
- bcd, boggle, caesar, canfield, countmail, cribbage, dab, fish, gomoku, hack, 
+ bcd, boggle, caesar, canfield, countmail, cribbage, dab, go-fish, gomoku, hack, 
  hangman, hunt, mille, monop, morse, number, pig, phantasia, pom, ppt, primes,
  quiz, random, rain, robots, sail, snake, tetris, trek, wargames, worm, worms,
  wump, wtf
diff --git a/debian/menu b/debian/menu
index ed4c6b9..85beac4 100644
--- a/debian/menu
+++ b/debian/menu
@@ -13,7 +13,7 @@
 	title="Cribbage" command="/usr/games/cribbage"
 ?package(bsdgames):needs="text" section="Games/Card" \
 	title="Go Fish" \
-	command="sh -c '/usr/games/fish;echo;echo PRESS ENTER;read line'"
+	command="sh -c '/usr/games/go-fish;echo;echo PRESS ENTER;read line'"
 ?package(bsdgames):needs="text" section="Games/Card" \
 	title="Mille Bornes" command="/usr/games/mille"
 ?package(bsdgames):needs="text" section="Games/Board" \
diff --git a/fish/Makefrag b/fish/Makefrag
index 1039af5..1fec493 100644
--- a/fish/Makefrag
+++ b/fish/Makefrag
@@ -31,7 +31,9 @@ fish_DIRS := $(GAMESDIR) $(MAN6DIR) $(shell dirname $(FISH_INSTRFILE))
 fish_all:	fish/fish fish/fish.instr fish/fish.6
 
 fish_install:	fish_all
-	$(INSTALL_BINARY) fish/fish $(INSTALL_PREFIX)$(GAMESDIR)/fish
-	$(HIDE_GAME) fish
+	$(INSTALL_BINARY) fish/fish $(INSTALL_PREFIX)$(GAMESDIR)/go-fish
+	$(HIDE_GAME) go-fish
 	$(INSTALL_DATA) fish/fish.instr $(INSTALL_PREFIX)$(FISH_INSTRFILE)
-	$(INSTALL_MANUAL) fish/fish.6
+	ln -sf fish.6 fish/go-fish.6 # hack for rename
+	$(INSTALL_MANUAL) fish/go-fish.6
+	rm -f fish/go-fish.6
diff --git a/fish/fish.6 b/fish/fish.6
index 398c55f..46eef2b 100644
--- a/fish/fish.6
+++ b/fish/fish.6
@@ -30,10 +30,10 @@
 .\"	@(#)fish.6	8.1 (Berkeley) 5/31/93
 .\"
 .Dd May 31, 1993
-.Dt FISH 6
+.Dt GO-FISH 6
 .Os
 .Sh NAME
-.Nm fish
+.Nm go-fish
 .Nd play
 .Dq Go Fish
 .Sh SYNOPSIS