diff --git a/Dockerfile b/Dockerfile
index e0d1e181c27f6eec272af70fbbb3c329b192e61f..61774ace02f1a847b0238e6371b3eed510299125 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,5 +2,9 @@ FROM debian:jessie
 WORKDIR /root/
 COPY patches patches
 COPY build.sh build.sh
+RUN apt-get update && apt-get -y upgrade
+RUN apt-get install -y --no-install-recommends \
+        curl debhelper dh-autoreconf dh-systemd \
+        autotools-dev libssl-dev nettle-dev docbook2x
 RUN ./build.sh
 CMD tar c *.deb
diff --git a/build.sh b/build.sh
index 73e1f654d048ce2ba18721f4f81435be232a1d3e..d4ee6f7a398c33adb2d3c39e241040dbd7467318 100755
--- a/build.sh
+++ b/build.sh
@@ -4,7 +4,7 @@ set -e
 
 package="radsecproxy"
 version="1.6.8"
-revision="uninett-2"
+revision="uninett2"
 
 export TZ="Europe/Oslo"
 now=$(date +"%a, %d %b %Y %T %z")
@@ -20,10 +20,8 @@ deb-src http://security.debian.org jessie/updates main
 EOF
 
 apt-get update
-apt-get -y upgrade
-apt-get -y install curl debhelper dh-autoreconf dh-systemd autotools-dev libssl-dev nettle-dev docbook2x
 
-curl --silent -o "${package}"_"${version}".orig.tar.gz "https://software.nordu.net/${package}/${package}-${version}.tar.gz"
+curl --silent -o "${package}"_"${version}"~"${revision}".orig.tar.gz "https://software.nordu.net/${package}/${package}-${version}.tar.gz"
 tar xzf "${package}"_"${version}".orig.tar.gz
 
 apt-get source ${package}