diff --git a/TODO.mdown b/TODO.mdown
index 38c51bb..9516b0a 100644
--- a/TODO.mdown
+++ b/TODO.mdown
@@ -3,8 +3,6 @@
 
 General configuration
 ---------------------
-- Support configurable naming conventions (i.e. name prefixes) for supporting
-  branches, instead of fixed 'release-\*' and 'hotfix-\*'
 
 Release branch support
 ----------------------
diff --git a/git-flow-feature b/git-flow-feature
index cda9c90..6ba664f 100755
--- a/git-flow-feature
+++ b/git-flow-feature
@@ -40,7 +40,8 @@
 		usage
 		exit 1
 	fi
-	BRANCH=feature/$NAME
+	PREFIX=$(git config --get gitflow.prefix.feature || echo feature/)
+	BRANCH=$PREFIX$NAME
 }
 
 cmd_help() {
diff --git a/git-flow-hotfix b/git-flow-hotfix
index a12619c..14ac662 100755
--- a/git-flow-hotfix
+++ b/git-flow-hotfix
@@ -35,7 +35,8 @@
 		usage
 		exit 1
 	fi
-	BRANCH=hotfix/$VERSION
+	PREFIX=$(git config --get gitflow.prefix.hotfix || echo hotfix/)
+	BRANCH=$PREFIX$VERSION
 }
 
 cmd_help() {
diff --git a/git-flow-release b/git-flow-release
index ca5e360..d42287d 100755
--- a/git-flow-release
+++ b/git-flow-release
@@ -35,7 +35,8 @@
 		usage
 		exit 1
 	fi
-	BRANCH=release/$VERSION
+	PREFIX=$(git config --get gitflow.prefix.release || echo release/)
+	BRANCH=$PREFIX$VERSION
 }
 
 cmd_help() {
diff --git a/git-flow-support b/git-flow-support
index c48e357..55f595e 100644
--- a/git-flow-support
+++ b/git-flow-support
@@ -24,7 +24,8 @@
 		usage
 		exit 1
 	fi
-	BRANCH=support/$VERSION
+	PREFIX=$(git config --get gitflow.prefix.support || echo support/)
+	BRANCH=$PREFIX$VERSION
 }
 
 cmd_help() {