diff --git a/gitflow-hotfix b/gitflow-hotfix
new file mode 100755
index 0000000..aa38ab6
--- /dev/null
+++ b/gitflow-hotfix
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+usage() {
+	echo "usage: gitflow start hotfix <release>"
+	echo "       gitflow finish hotfix <release>"
+}
+
+start() {
+	# TODO
+	gitflow_check_clean_working_tree
+	echo "git checkout -b hotfix-$RELEASE master"
+	echo "Bump version number"
+	echo "Fix bug"
+}
+
+finish() {
+	# TODO
+	gitflow_check_clean_working_tree
+	echo "git checkout master"
+	echo "git merge --no-ff hotfix-$RELEASE"
+	echo "git checkout develop"
+	echo "git merge --no-ff hotfix-$RELEASE"
+	echo "git branch -d hotfix-$RELEASE"
+}
+