diff --git a/.gitignore b/.gitignore
index 713859560..34d16b302 100644
--- a/.gitignore
+++ b/.gitignore
@@ -123,3 +123,6 @@ qa/pull-tester/test.*/*
 /doc/doxygen/
 
 libzcashconsensus.pc
+
+contrib/debian/files
+contrib/debian/substvars
diff --git a/contrib/DEBIAN/changelog b/contrib/debian/changelog
similarity index 100%
rename from contrib/DEBIAN/changelog
rename to contrib/debian/changelog
diff --git a/contrib/DEBIAN/compat b/contrib/debian/compat
similarity index 100%
rename from contrib/DEBIAN/compat
rename to contrib/debian/compat
diff --git a/contrib/DEBIAN/control b/contrib/debian/control
similarity index 85%
rename from contrib/DEBIAN/control
rename to contrib/debian/control
index 02eb73328..b0c220cf0 100644
--- a/contrib/DEBIAN/control
+++ b/contrib/debian/control
@@ -3,16 +3,16 @@ Section: utils
 Priority: optional
 Maintainer: Zcash Company <team@z.cash>
 Homepage: https://z.cash
-Build-Depends: autoconf, automake, bsdmainutils, build-essential
- git, g++-multilib, libc6-dev, libtool
- m4, ncurses-dev, pkg-config, python
+Build-Depends: autoconf, automake, bsdmainutils, build-essential,
+ git, g++-multilib, libc6-dev, libtool,
+ m4, ncurses-dev, pkg-config, python,
  unzip, wget, zlib1g-dev
 Vcs-Git: https://github.com/zcash/zcash.git
 Vcs-Browser: https://github.com/zcash/zcash
+
 Package: zcash
-Version: 1.0.4
 Architecture: amd64
-Depends: libgomp1
+Depends: ${shlibs:Depends}
 Description: HTTPS for money.
  Based on Bitcoin's code, it intends to offer a far higher standard
  of privacy and anonymity through a sophisticiated zero-knowledge
diff --git a/contrib/DEBIAN/copyright b/contrib/debian/copyright
similarity index 100%
rename from contrib/DEBIAN/copyright
rename to contrib/debian/copyright
diff --git a/contrib/DEBIAN/examples/zcash.conf b/contrib/debian/examples/zcash.conf
similarity index 100%
rename from contrib/DEBIAN/examples/zcash.conf
rename to contrib/debian/examples/zcash.conf
diff --git a/contrib/DEBIAN/manpages/zcash-cli.1 b/contrib/debian/manpages/zcash-cli.1
similarity index 100%
rename from contrib/DEBIAN/manpages/zcash-cli.1
rename to contrib/debian/manpages/zcash-cli.1
diff --git a/contrib/DEBIAN/manpages/zcash-fetch-params.1 b/contrib/debian/manpages/zcash-fetch-params.1
similarity index 100%
rename from contrib/DEBIAN/manpages/zcash-fetch-params.1
rename to contrib/debian/manpages/zcash-fetch-params.1
diff --git a/contrib/DEBIAN/manpages/zcashd.1 b/contrib/debian/manpages/zcashd.1
similarity index 100%
rename from contrib/DEBIAN/manpages/zcashd.1
rename to contrib/debian/manpages/zcashd.1
diff --git a/contrib/DEBIAN/postinst b/contrib/debian/postinst
similarity index 100%
rename from contrib/DEBIAN/postinst
rename to contrib/debian/postinst
diff --git a/contrib/DEBIAN/postrm b/contrib/debian/postrm
similarity index 100%
rename from contrib/DEBIAN/postrm
rename to contrib/debian/postrm
diff --git a/contrib/DEBIAN/preinst b/contrib/debian/preinst
similarity index 100%
rename from contrib/DEBIAN/preinst
rename to contrib/debian/preinst
diff --git a/contrib/DEBIAN/prerm b/contrib/debian/prerm
similarity index 100%
rename from contrib/DEBIAN/prerm
rename to contrib/debian/prerm
diff --git a/contrib/DEBIAN/rules b/contrib/debian/rules
similarity index 100%
rename from contrib/DEBIAN/rules
rename to contrib/debian/rules
diff --git a/contrib/DEBIAN/zcash.examples b/contrib/debian/zcash.examples
similarity index 100%
rename from contrib/DEBIAN/zcash.examples
rename to contrib/debian/zcash.examples
diff --git a/contrib/DEBIAN/zcash.install b/contrib/debian/zcash.install
similarity index 100%
rename from contrib/DEBIAN/zcash.install
rename to contrib/debian/zcash.install
diff --git a/contrib/DEBIAN/zcash.manpages b/contrib/debian/zcash.manpages
similarity index 100%
rename from contrib/DEBIAN/zcash.manpages
rename to contrib/debian/zcash.manpages
diff --git a/doc/release-process.md b/doc/release-process.md
index 93b97adaf..cfbf4fad1 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -35,7 +35,6 @@ previous release:
     README.md
     src/clientversion.h
     configure.ac
-    contrib/DEBIAN/control
     contrib/gitian-descriptors/gitian-linux.yml
 
     Build and commit to update versions, and then perform the following commands:
diff --git a/zcutil/build-debian-package.sh b/zcutil/build-debian-package.sh
index 39fbfe67b..55e07e689 100755
--- a/zcutil/build-debian-package.sh
+++ b/zcutil/build-debian-package.sh
@@ -8,7 +8,7 @@ set -x
 BUILD_PATH="/tmp/zcbuild"
 PACKAGE_NAME="zcash"
 SRC_PATH=`pwd`
-SRC_DEB=$SRC_PATH/contrib/DEBIAN
+SRC_DEB=$SRC_PATH/contrib/debian
 
 umask 022
 
@@ -16,7 +16,7 @@ if [ ! -d $BUILD_PATH ]; then
     mkdir $BUILD_PATH
 fi
 
-PACKAGE_VERSION=$(grep Version $SRC_PATH/contrib/DEBIAN/control | cut -d: -f2 | tr -d ' ')
+PACKAGE_VERSION=$($SRC_PATH/src/zcashd --version | grep version | cut -d' ' -f4 | tr -d v)
 BUILD_DIR="$BUILD_PATH/$PACKAGE_NAME-$PACKAGE_VERSION-amd64"
 
 if [ -d $BUILD_DIR ]; then
@@ -30,8 +30,6 @@ DEB_MAN=$BUILD_DIR/usr/share/man/man1
 mkdir -p $BUILD_DIR/DEBIAN $DEB_CMP $DEB_BIN $DEB_DOC $DEB_MAN
 chmod 0755 -R $BUILD_DIR/*
 
-# Copy control file
-cp $SRC_DEB/control $BUILD_DIR/DEBIAN
 # Package maintainer scripts (currently empty)
 #cp $SRC_DEB/postinst $BUILD_DIR/DEBIAN
 #cp $SRC_DEB/postrm $BUILD_DIR/DEBIAN
@@ -60,6 +58,12 @@ gzip --best -n $DEB_MAN/zcashd.1
 gzip --best -n $DEB_MAN/zcash-cli.1
 gzip --best -n $DEB_MAN/zcash-fetch-params.1
 
+cd $SRC_PATH/contrib
+
+# Create the control file
+dpkg-shlibdeps $DEB_BIN/zcashd $DEB_BIN/zcash-cli
+dpkg-gencontrol -P$BUILD_DIR
+
 # Create the Debian package
 fakeroot dpkg-deb --build $BUILD_DIR
 cp $BUILD_PATH/$PACKAGE_NAME-$PACKAGE_VERSION-amd64.deb $SRC_PATH