diff --git a/Makefile b/Makefile
index fb703f02b..4eeeda230 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ copyfiles:
 	chown dokku:dokku -R ${PLUGINS_PATH} ${CORE_PLUGINS_PATH} || true
 	$(MAKE) addman
 
-addman: help2man
+addman: help2man man-db
 	mkdir -p /usr/local/share/man/man1
 	help2man -Nh help -v version -n "configure and get information from your dokku installation" -o /usr/local/share/man/man1/dokku.1 dokku
 	mandb
diff --git a/dokku b/dokku
index b26f6c799..05ae39621 100755
--- a/dokku
+++ b/dokku
@@ -9,7 +9,7 @@ export DOKKU_ROOT=${DOKKU_ROOT:=~dokku}
 
 export DOKKU_DISTRO
 # shellcheck disable=SC1091
-DOKKU_DISTRO=$(. /etc/os-release && echo "$ID")
+DOKKU_DISTRO=$(. /etc/os-release > /dev/null 2>&1 || true ; echo "$ID")
 
 export DOKKU_IMAGE=${DOKKU_IMAGE:="gliderlabs/herokuish"}
 export DOKKU_LIB_ROOT=${DOKKU_LIB_PATH:="/var/lib/dokku"}