diff --git a/bootstrap.sh b/bootstrap.sh
index 903413d21..96755627b 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -24,6 +24,11 @@ if ! command -v apt-get &>/dev/null; then
   exit 1
 fi
 
+hostname -f > /dev/null 2>&1 || {
+  echo "This installation script requires that you have a hostname set for the instance. Please set a hostname for 127.0.0.1 in your /etc/hosts"
+  exit 1
+}
+
 apt-get update -qq > /dev/null
 which curl > /dev/null || apt-get install -qq -y curl
 [[ $(lsb_release -sr) == "12.04" ]] && apt-get install -qq -y python-software-properties
diff --git a/deb.mk b/deb.mk
index 704db7669..62dfac5c2 100644
--- a/deb.mk
+++ b/deb.mk
@@ -49,7 +49,7 @@ deb-all: deb-herokuish deb-dokku deb-gems deb-plugn deb-sshcommand
 deb-setup:
 	echo "-> Updating deb repository and installing build requirements"
 	sudo apt-get update -qq > /dev/null
-	sudo apt-get install -qq -y gcc git ruby1.9.1-dev 2>&1 > /dev/null
+	sudo apt-get install -qq -y gcc git ruby1.9.1-dev > /dev/null 2>&1
 	command -v fpm > /dev/null || sudo gem install fpm --no-ri --no-rdoc
 	ssh -o StrictHostKeyChecking=no git@github.com || true
 
@@ -127,7 +127,7 @@ deb-plugn: deb-setup
 	echo "-> Copying files into place"
 	mkdir -p /tmp/build/usr/local/bin $(GOPATH)
 	sudo apt-get update -qq > /dev/null
-	sudo apt-get install -qq -y git golang mercurial 2>&1 > /dev/null
+	sudo apt-get install -qq -y git golang mercurial > /dev/null 2>&1
 	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH) && cd /tmp/tmp/plugn && make deps
 	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH) && cd /tmp/tmp/plugn && go build -o plugn
 	mv /tmp/tmp/plugn/plugn /tmp/build/usr/local/bin/plugn