diff --git a/Dockerfile b/Dockerfile
index 41cef3db91b4ee4ed268756ce10042c6b7b5decc..18accc14e24b8fff571ae82a8c9763c6c967475d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,6 @@ WORKDIR /root/
 COPY patches patches
 COPY build.sh build.sh
 RUN apt-get update && apt-get -y upgrade
-RUN apt-get install -y curl debhelper dh-autoreconf dh-systemd autotools-dev libssl-dev nettle-dev docbook2x
+RUN apt-get install -y curl build-essential 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 ff6fbe91ef16e64fe1cc2742e9b4ec13f4adbe90..62cf034338d9632436505fff9ba2e3b4877230c8 100755
--- a/build.sh
+++ b/build.sh
@@ -4,7 +4,7 @@ set -e
 
 package="radsecproxy"
 version="1.6.8"
-revision="uninett2"
+revision="2~uninett"
 
 export TZ="Europe/Oslo"
 now=$(date +"%a, %d %b %Y %T %z")
@@ -21,8 +21,8 @@ EOF
 
 apt-get update
 
-curl --silent -o "${package}"_"${version}"~"${revision}".orig.tar.gz "https://software.nordu.net/${package}/${package}-${version}.tar.gz"
-tar xzf "${package}"_"${version}"~"${revision}".orig.tar.gz
+curl --silent -o "${package}"_"${version}".orig.tar.gz "https://software.nordu.net/${package}/${package}-${version}.tar.gz"
+tar xzf "${package}"_"${version}".orig.tar.gz
 
 apt-get source ${package}
 tar xf "${package}"_*.debian.tar.xz -C "${package}"-"${version}/"
@@ -33,7 +33,7 @@ for patch in patches/* ; do
 done >> "${package}"-"${version}"/debian/patches/series
 
 cat > changelog << EOF
-radsecproxy (${version}~${revision}) unstable; urgency=medium
+radsecproxy (${version}-${revision}) unstable; urgency=medium
 
   * New upstream release, with uninett-specific patches