diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8d03848
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+debian/files
+debian/*.substvars
+debian/*.debhelper.log
+debian/*/*
diff --git a/AUTHORS b/AUTHORS
index 060f09f..69e9b13 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,5 +11,9 @@
 - Felipe Talavera
 - Guillaume-Jean Herbiet
 - Joseph A. Levin
+- Jannis Leidel
+- Konstantin Tjuterev
+- Kiall Mac Innes
+- Jon Bernard
 
 Portions derived from other open source works are clearly marked.
diff --git a/Makefile b/Makefile
index 6f82544..764bd23 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,13 @@
 # those of the authors and should not be interpreted as representing official
 # policies, either expressed or implied, of Vincent Driessen.
 #
-prefix=/usr/local
+
+# Determine if we're inside a debian build .. 
+ifdef DEB_BUILD_ARCH
+   prefix=$(DESTDIR)/usr/
+else
+   prefix=/usr/local
+endif
 
 # files that need mode 755
 EXEC_FILES=git-flow
diff --git a/contrib/debian/changelog b/contrib/debian/changelog
new file mode 100644
index 0000000..f889596
--- /dev/null
+++ b/contrib/debian/changelog
@@ -0,0 +1,5 @@
+gitflow (0.4.1) unstable; urgency=low
+
+  * Initial Debian Packaging
+
+ -- Kiall Mac Innes <kiall@managedit.ie>  Mon, 25 Apr 2011 23:51:42 +0100
diff --git a/contrib/debian/compat b/contrib/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/contrib/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/contrib/debian/control b/contrib/debian/control
new file mode 100644
index 0000000..d47b2b0
--- /dev/null
+++ b/contrib/debian/control
@@ -0,0 +1,14 @@
+Source: gitflow
+Section: vcs
+Priority: optional
+Maintainer: Kiall Mac Innes <kiall@managedit.ie>
+Build-Depends: debhelper (>= 7.0.50~), git
+Standards-Version: 3.9.1
+Homepage: http://nvie.com/posts/a-successful-git-branching-model/
+Vcs-Git: https://github.com/nvie/gitflow.git
+Vcs-Browser: https://github.com/nvie/gitflow
+
+Package: gitflow
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, git
+Description: Git extensions to provide high-level repository operations for Vincent Driessen's branching model
diff --git a/contrib/debian/copyright b/contrib/debian/copyright
new file mode 100644
index 0000000..a08359a
--- /dev/null
+++ b/contrib/debian/copyright
@@ -0,0 +1,40 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: gitflow
+Source: <url://example.com>
+
+Files: *
+Copyright: <years> <put author's name and email here>
+           <years> <likewise for another author>
+License: BSD-3-Clause
+
+Files: debian/*
+Copyright: 2011 Kiall <kiall@managedit.ie>
+License: BSD-3-Clause
+
+License: BSD-3-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
diff --git a/contrib/debian/docs b/contrib/debian/docs
new file mode 100644
index 0000000..ceda507
--- /dev/null
+++ b/contrib/debian/docs
@@ -0,0 +1 @@
+README.mdown
diff --git a/contrib/debian/rules b/contrib/debian/rules
new file mode 100755
index 0000000..79092d6
--- /dev/null
+++ b/contrib/debian/rules
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+override_dh_testdir:
+	dh_testdir
+	git submodule init && git submodule update
+%:
+	dh $@ 
diff --git a/git-flow-feature b/git-flow-feature
index 226730a..ebbb035 100644
--- a/git-flow-feature
+++ b/git-flow-feature
@@ -281,16 +281,17 @@
 	require_clean_working_tree
 
 	# update local repo with remote changes first, if asked
-	if has "$ORIGIN/$BRANCH" "$(git_remote_branches)"; then
+	if has "$ORIGIN/$BRANCH" $(git_remote_branches); then
 		if flag fetch; then
 			git fetch -q "$ORIGIN" "$BRANCH"
+			git fetch -q "$ORIGIN" "$DEVELOP_BRANCH"
 		fi
 	fi
 
-	if has "$ORIGIN/$BRANCH" "$(git_remote_branches)"; then
+	if has "$ORIGIN/$BRANCH" $(git_remote_branches); then
 		require_branches_equal "$BRANCH" "$ORIGIN/$BRANCH"
 	fi
-	if has "$ORIGIN/$DEVELOP_BRANCH" "$(git_remote_branches)"; then
+	if has "$ORIGIN/$DEVELOP_BRANCH" $(git_remote_branches); then
 		require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
 	fi
 
diff --git a/git-flow-hotfix b/git-flow-hotfix
index 5660131..2618113 100644
--- a/git-flow-hotfix
+++ b/git-flow-hotfix
@@ -167,7 +167,7 @@
 	if flag fetch; then
 		git fetch -q "$ORIGIN" "$MASTER_BRANCH"
 	fi
-	if has "$ORIGIN/$MASTER_BRANCH" "$(git_remote_branches)"; then
+	if has "$ORIGIN/$MASTER_BRANCH" $(git_remote_branches); then
 		require_branches_equal "$MASTER_BRANCH" "$ORIGIN/$MASTER_BRANCH"
 	fi
 
@@ -213,10 +213,10 @@
 		git fetch -q "$ORIGIN" "$DEVELOP_BRANCH" || \
 		  die "Could not fetch $DEVELOP_BRANCH from $ORIGIN."
 	fi
-	if has "$ORIGIN/$MASTER_BRANCH" "$(git_remote_branches)"; then
+	if has "$ORIGIN/$MASTER_BRANCH" $(git_remote_branches); then
 		require_branches_equal "$MASTER_BRANCH" "$ORIGIN/$MASTER_BRANCH"
 	fi
-	if has "$ORIGIN/$DEVELOP_BRANCH" "$(git_remote_branches)"; then
+	if has "$ORIGIN/$DEVELOP_BRANCH" $(git_remote_branches); then
 		require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
 	fi
 
diff --git a/git-flow-release b/git-flow-release
index 05815bc..08f595b 100644
--- a/git-flow-release
+++ b/git-flow-release
@@ -44,7 +44,7 @@
 
 usage() {
 	echo "usage: git flow release [list] [-v]"
-	echo "       git flow release start [-F] <version>"
+	echo "       git flow release start [-F] <version> [<base>]"
 	echo "       git flow release finish [-Fsumpk] <version>"
 	echo "       git flow release publish <name>"
 	echo "       git flow release track <name>"
@@ -164,7 +164,7 @@
 	if flag fetch; then
 		git fetch -q "$ORIGIN" "$DEVELOP_BRANCH"
 	fi
-	if has "$ORIGIN/$DEVELOP_BRANCH" "$(git_remote_branches)"; then
+	if has "$ORIGIN/$DEVELOP_BRANCH" $(git_remote_branches); then
 		require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
 	fi
 
@@ -211,10 +211,10 @@
 		git fetch -q "$ORIGIN" "$DEVELOP_BRANCH" || \
 		  die "Could not fetch $DEVELOP_BRANCH from $ORIGIN."
 	fi
-	if has "$ORIGIN/$MASTER_BRANCH" "$(git_remote_branches)"; then
+	if has "$ORIGIN/$MASTER_BRANCH" $(git_remote_branches); then
 		require_branches_equal "$MASTER_BRANCH" "$ORIGIN/$MASTER_BRANCH"
 	fi
-	if has "$ORIGIN/$DEVELOP_BRANCH" "$(git_remote_branches)"; then
+	if has "$ORIGIN/$DEVELOP_BRANCH" $(git_remote_branches); then
 		require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
 	fi
 
diff --git a/gitflow-common b/gitflow-common
index 75eb210..252f5d0 100644
--- a/gitflow-common
+++ b/gitflow-common
@@ -181,7 +181,7 @@
 
 # loading settings that can be overridden using git config
 gitflow_load_settings() {
-	export DOT_GIT_DIR=$(git rev-parse --git-dir >/dev/null 2>&1)
+	export DOT_GIT_DIR=$(git rev-parse --git-dir 2>/dev/null)
 	export MASTER_BRANCH=$(git config --get gitflow.branch.master)
 	export DEVELOP_BRANCH=$(git config --get gitflow.branch.develop)
 	export ORIGIN=$(git config --get gitflow.origin || echo origin)
@@ -288,9 +288,11 @@
 }
 
 require_tag_absent() {
-	if has $1 $(git_all_tags); then
-		die "Tag '$1' already exists. Pick another name."
-	fi
+	for tag in $(git_all_tags); do
+		if [ "$1" = "$tag" ]; then
+			die "Tag '$1' already exists. Pick another name."
+		fi
+	done
 }
 
 require_branches_equal() {