diff --git a/dev-vcs/git_flow/git_flow-1.8.0.recipe b/dev-vcs/git_flow/git_flow-1.8.0.recipe
new file mode 100644
index 000000000..c229d6485
--- /dev/null
+++ b/dev-vcs/git_flow/git_flow-1.8.0.recipe
@@ -0,0 +1,36 @@
+SUMMARY="Git extensions for Vincent Driessen's branching model"
+DESCRIPTION="Vincent Driessen's branching model is a git branching \
+and release management strategy that helps developers keep track of \
+features, hotfixes and releases in bigger software projects."
+HOMEPAGE="https://github.com/petervanderdoes/gitflow-avh"
+COPYRIGHT="2010 Vincent Driessen
+	2012-2015 Peter van der Does"
+LICENSE="BSD (2-clause)"
+REVISION="1"
+SOURCE_URI="https://github.com/petervanderdoes/gitflow-avh/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="350665a9de7a9fe58ab82df5ef70c4e6c4f95bf844e30c23e2f3486396727511"
+SOURCE_DIR="gitflow-avh-$portVersion"
+PATCHES="git_flow-$portVersion.patch"
+
+ARCHITECTURES="any"
+
+PROVIDES="
+	git_flow = $portVersion
+	"
+
+REQUIRES="
+	git
+	cmd:getopt
+	"
+
+BUILD_PREREQUIRES="
+	cmd:make
+	"
+
+INSTALL()
+{
+	mkdir -p $libDir/git-core
+
+	make install prefix=$dataDir \
+		libdir=$libDir
+}
diff --git a/dev-vcs/git_flow/patches/git_flow-1.8.0.patch b/dev-vcs/git_flow/patches/git_flow-1.8.0.patch
new file mode 100644
index 000000000..c19d0672f
--- /dev/null
+++ b/dev-vcs/git_flow/patches/git_flow-1.8.0.patch
@@ -0,0 +1,49 @@
+From 3b6eb2569b1cb515a8c48974bb54f6fa2a4ca834 Mon Sep 17 00:00:00 2001
+From: Kostadin Damyanov <maxmight@gmail.com>
+Date: Tue, 13 Oct 2015 00:55:20 +0300
+Subject: [PATCH] Makefile fix.
+
+---
+ Makefile | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0718bbb..e447b09 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@
+ #
+ # Original Author:
+ # Copyright 2010 Vincent Driessen. All rights reserved.
+-# 
++#
+ # Redistribution and use in source and binary forms, with or without
+ # modification, are permitted provided that the following conditions are met:
+ #
+@@ -28,8 +28,8 @@
+ 
+ prefix=/usr/local
+ 
+-datarootdir=$(prefix)/share
+-docdir=$(datarootdir)/doc/gitflow
++datarootdir=$(prefix)/git-flow
++docdir=$(datarootdir)/doc/
+ # files that need mode 755
+ EXEC_FILES=git-flow
+ 
+@@ -53,10 +53,9 @@ all:
+ 	@echo "       make uninstall"
+ 
+ install:
+-	install -d -m 0755 $(prefix)/bin
+ 	install -d -m 0755 $(docdir)/hooks
+-	install -m 0755 $(EXEC_FILES) $(prefix)/bin
+-	install -m 0644 $(SCRIPT_FILES) $(prefix)/bin
++	install -m 0755 $(EXEC_FILES) $(libdir)/git-core
++	install -m 0644 $(SCRIPT_FILES) $(libdir)/git-core
+ 	install -m 0644 $(HOOK_FILES) $(docdir)/hooks
+ 
+ uninstall:
+-- 
+2.2.2
+