diff --git a/dist/redhat/build_rpm.sh b/dist/redhat/build_rpm.sh
index 21c1d21..4211191 100755
--- a/dist/redhat/build_rpm.sh
+++ b/dist/redhat/build_rpm.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 
 RPMBUILD=`pwd`/build/rpmbuild
 
diff --git a/dist/ubuntu/build_deb.sh b/dist/ubuntu/build_deb.sh
index 7995e8f..7e0a5bb 100644
--- a/dist/ubuntu/build_deb.sh
+++ b/dist/ubuntu/build_deb.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 
 if [ ! -e dist/ubuntu/build_deb.sh ]; then
     echo "run build_deb.sh in top of scylla dir"
@@ -9,6 +9,10 @@ if [ -e debian ] || [ -e build ] || [ -e target ] || [ -e m2 ] || [ -e dependenc
     rm -rf debian build target m2 dependency-reduced-pom.xml
 fi
 
+DISTRIBUTION=`lsb_release -i|awk '{print $3}'`
+RELEASE=`lsb_release -r|awk '{print $2}'`
+CODENAME=`lsb_release -c|awk '{print $2}'`
+
 VERSION=$(./SCYLLA-VERSION-GEN)
 SCYLLA_VERSION=$(cat build/SCYLLA-VERSION-FILE | sed 's/\.rc/~rc/')
 SCYLLA_RELEASE=$(cat build/SCYLLA-RELEASE-FILE)
@@ -20,8 +24,15 @@ echo $VERSION > version
 
 cp -a dist/ubuntu/debian debian
 cp dist/ubuntu/changelog.in debian/changelog
+cp dist/ubuntu/rules.in debian/rules
 sed -i -e "s/@@VERSION@@/$SCYLLA_VERSION/g" debian/changelog
 sed -i -e "s/@@RELEASE@@/$SCYLLA_RELEASE/g" debian/changelog
+sed -i -e "s/@@CODENAME@@/$CODENAME/g" debian/changelog
+if [ "$RELEASE" = "14.04" ]; then
+    sed -i -e "s/@@DH_INSTALLINIT@@/--upstart-only/g" debian/rules
+else
+    sed -i -e "s/@@DH_INSTALLINIT@@//g" debian/rules
+fi
 
-sudo apt-get -y install debhelper maven openjdk-7-jdk devscripts
+echo Y | sudo mk-build-deps -i -r
 debuild -r fakeroot -us -uc
diff --git a/dist/ubuntu/changelog.in b/dist/ubuntu/changelog.in
index e6f6b89..966f785 100644
--- a/dist/ubuntu/changelog.in
+++ b/dist/ubuntu/changelog.in
@@ -1,4 +1,4 @@
-scylla-jmx (@@VERSION@@-@@RELEASE@@-ubuntu1) trusty; urgency=medium
+scylla-jmx (@@VERSION@@-@@RELEASE@@-ubuntu1) @@CODENAME@@; urgency=medium
 
   * Initial release.
 
diff --git a/dist/ubuntu/debian/control b/dist/ubuntu/debian/control
index 1def5fb..223a171 100644
--- a/dist/ubuntu/debian/control
+++ b/dist/ubuntu/debian/control
@@ -4,11 +4,11 @@ Homepage: http://scylladb.com
 Section: database
 Priority: optional
 Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 9), maven, openjdk-7-jdk | java7-jdk | openjdk-8-jdk | java8-jdk
+Build-Depends: debhelper (>= 9), maven, default-jdk | java7-jdk | java8-jdk
 
 Package: scylla-jmx
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-7-jre-headless | openjdk-8-jre-headless | java-runtime-headless, scylla-server
+Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre-headless | java-runtime-headless, scylla-server
 Description: Scylla JMX server binaries 
  Scylla is a highly scalable, eventually consistent, distributed,
  partitioned row DB.
diff --git a/dist/ubuntu/debian/rules b/dist/ubuntu/rules.in
similarity index 93%
rename from dist/ubuntu/debian/rules
rename to dist/ubuntu/rules.in
index 2268912..d63103b 100755
--- a/dist/ubuntu/debian/rules
+++ b/dist/ubuntu/rules.in
@@ -24,7 +24,7 @@ override_dh_auto_install:
 	cp $(CURDIR)/target/scylla-jmx-1.0.jar $(DEST)
 
 override_dh_installinit:
-	dh_installinit --no-start --upstart-only
+	dh_installinit --no-start @@DH_INSTALLINIT@@
 
 %:
 	dh $@