diff --git a/git-flow-hotfix b/git-flow-hotfix
index 3926e40..1016b5d 100644
--- a/git-flow-hotfix
+++ b/git-flow-hotfix
@@ -159,6 +159,7 @@
 	DEFINE_boolean sign false "sign the release tag cryptographically" s
 	DEFINE_string signingkey "" "use the given GPG-key for the digital signature (implies -s)" u
 	DEFINE_string message "" "use the given tag message" m
+    DEFINE_boolean push false "push to $ORIGIN after performing finish" p
 	parse_args "$@"
 	require_version_arg
 
@@ -220,8 +221,14 @@
 	# delete branch
 	git branch -d "$BRANCH"
 
-	# TODO: Implement an optional push to master
-	# git push origin develop; git push origin master; git push --tags origin
+    if flag push; then
+        git push "$ORIGIN" "$DEVELOP_BRANCH" || \
+            die "Could not push to $DEVELOP_BRANCH from $ORIGIN."
+        git push "$ORIGIN" "$MASTER_BRANCH" || \
+            die "Could not push to $MASTER_BRANCH from $ORIGIN."
+        git push --tags "$ORIGIN" || \
+            die "Could not push tags to $ORIGIN."
+    fi
 
 	echo
 	echo "Summary of actions:"
@@ -230,5 +237,8 @@
 	echo "- The hotfix was tagged '$VERSION_PREFIX$VERSION'"
 	echo "- Hotfix branch has been back-merged into '$DEVELOP_BRANCH'"
 	echo "- Hotfix branch '$BRANCH' has been deleted"
+    if flag push; then
+        echo "- '$DEVELOP_BRANCH', '$MASTER_BRANCH' and tags have been pushed to '$ORIGIN'"
+    fi
 	echo
 }