diff --git a/app-shells/fish/fish-1.23.1-git.bep b/app-shells/fish/fish-1.23.1-git.bep
new file mode 100644
index 000000000..db9e1bea1
--- /dev/null
+++ b/app-shells/fish/fish-1.23.1-git.bep
@@ -0,0 +1,29 @@
+DESCRIPTION="The friendly interactive shell" 
+HOMEPAGE="http://ridiculousfish.com/shell/" 
+SRC_URI="git://git.gitorious.org/fish-shell/fish-shell.git"
+#CHECKSUM_MD5=""
+REVISION="1"
+STATUS_HAIKU="untested"
+DEPEND="app-doc/doxygen >= 1.7.4
+	sys-libs/ncurses >= 5.9"
+MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
+BUILD {
+    cd fish-1.23.1-git
+	libtoolize --force --copy --install
+    autoconf
+    ./configure --without-xsel --prefix=`finddir B_COMMON_DIRECTORY`
+    make
+}
+
+INSTALL {
+    cd fish-1.23.1-git
+    make install DESTDIR=${DESTDIR}
+}
+
+TEST {
+	cd fish-1.23.1-git
+	make test
+}
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="2005-2009 Axel Liljencrantz"
diff --git a/app-shells/fish/patches/fish-1.23.1.patch b/app-shells/fish/patches/fish-1.23.1-git.patch
similarity index 93%
rename from app-shells/fish/patches/fish-1.23.1.patch
rename to app-shells/fish/patches/fish-1.23.1-git.patch
index 0b2e4a45b..4548969ba 100644
--- a/app-shells/fish/patches/fish-1.23.1.patch
+++ b/app-shells/fish/patches/fish-1.23.1-git.patch
@@ -1,7 +1,7 @@
-diff --git a/configure.ac b/configure.ac
+diff --git a/configure.ac fish-1.23.1-git/configure.ac
 index 377ab5e..672d34b 100644
 --- a/configure.ac
-+++ b/configure.ac
++++ fish-1.23.1-git/configure.ac
 @@ -105,7 +105,7 @@ fi
  # tree and doesn't update CFLAGS.
  #
@@ -100,10 +100,10 @@ index 377ab5e..672d34b 100644
  LIBS_FISHD=$LIBS
  LIBS=$LIBS_COMMON
  
-diff --git a/proc.c b/proc.c
+diff --git a/proc.c fish-1.23.1-git/proc.c
 index edcc7c6..30dd96f 100644
 --- a/proc.c
-+++ b/proc.c
++++ fish-1.23.1-git/proc.c
 @@ -482,8 +482,11 @@ static void handle_child_status( pid_t pid, int status )
  	return;
  }
@@ -117,10 +117,10 @@ index edcc7c6..30dd96f 100644
  {
  
  	int status;
-diff --git a/proc.h b/proc.h
+diff --git a/proc.h fish-1.23.1-git/proc.h
 index dd46bc0..3618956 100644
 --- a/proc.h
-+++ b/proc.h
++++ fish-1.23.1-git/proc.h
 @@ -427,7 +427,9 @@ int job_reap( int interactive );
     Signal handler for SIGCHLD. Mark any processes with relevant
     information.
@@ -131,10 +131,10 @@ index dd46bc0..3618956 100644
  
  /**
     Send the specified signal to all processes in the specified job.
-diff --git a/signal.c b/signal.c
+diff --git a/signal.c fish-1.23.1-git/signal.c
 index 2ac38aa..3ff1d38 100644
 --- a/signal.c
-+++ b/signal.c
++++ fish-1.23.1-git/signal.c
 @@ -29,6 +29,14 @@ The library for various signal related issues
  #include "reader.h"
  #include "proc.h"