diff --git a/Makefile.packaging b/Makefile.packaging
index ee5322f2925273e07b7a0cb7fa078be7fbeb6da1..0d159b30162bc3e2ff57ed3d39a5c7a0fb5a00ba 100644
--- a/Makefile.packaging
+++ b/Makefile.packaging
@@ -83,6 +83,8 @@ package-all: package-debian_8 \
              package-ubuntu_16.04_i386 \
              package-ubuntu_16.10 \
              package-ubuntu_16.10_i386 \
+             package-ubuntu_17.04 \
+             package-ubuntu_17.04_i386 \
              package-fedora_22 \
              package-fedora_22_i386 \
              package-fedora_23 \
diff --git a/docker/Dockerfile_ubuntu_17.04 b/docker/Dockerfile_ubuntu_17.04
new file mode 100644
index 0000000000000000000000000000000000000000..881688b3b40484b5b8d9b919d893491dcdddc656
--- /dev/null
+++ b/docker/Dockerfile_ubuntu_17.04
@@ -0,0 +1,76 @@
+FROM ubuntu:17.04
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get clean
+RUN apt-get update && \
+    apt-get install -y vim \
+                       devscripts \
+                       software-properties-common
+
+# software-properties-common is needed for
+# add-apt-repository
+RUN add-apt-repository universe
+
+RUN apt-get clean
+RUN apt-get update && \
+    apt-get install -y equivs
+
+# Speed up mk-build-deps
+RUN apt-get clean
+RUN apt-get update && \
+    apt-get install -y -o Acquire::Retires=10 \
+        autoconf \
+        automake \
+        autopoint \
+        cmake \
+        libtool \
+        libdbus-1-dev \
+        libdbus-c++-dev \
+        libupnp-dev \
+        libgnutls28-dev \
+        libebook1.2-dev \
+        libclutter-gtk-1.0-dev \
+        libclutter-1.0-dev \
+        libglib2.0-dev \
+        libgtk-3-dev \
+        libnotify-dev \
+        qtbase5-dev \
+        qttools5-dev \
+        qttools5-dev-tools \
+        yasm \
+        autotools-dev \
+        gettext \
+        libpulse-dev \
+        libsamplerate0-dev \
+        libasound2-dev \
+        libexpat1-dev \
+        libpcre3-dev \
+        libyaml-cpp-dev \
+        libboost-dev \
+        libsndfile1-dev \
+        libxext-dev \
+        libxfixes-dev \
+        libspeex-dev \
+        libspeexdsp-dev \
+        uuid-dev \
+        libavcodec-dev \
+        libavutil-dev \
+        libavformat-dev \
+        libswscale-dev \
+        libavdevice-dev \
+        libopus-dev \
+        libudev-dev \
+        libgsm1-dev \
+        libjsoncpp-dev \
+        libnatpmp-dev \
+        libappindicator3-dev \
+        libqrencode-dev \
+        libnm-glib-dev \
+        libwebkit2gtk-4.0-dev \
+        libcrypto++-dev \
+        libva-dev
+
+ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
+
+CMD /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_17.04_i386 b/docker/Dockerfile_ubuntu_17.04_i386
new file mode 100644
index 0000000000000000000000000000000000000000..d99c06891b94db859beca7659422f79da25163b3
--- /dev/null
+++ b/docker/Dockerfile_ubuntu_17.04_i386
@@ -0,0 +1,76 @@
+FROM savoirfairelinux/ring-ubuntu32:17.04
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get clean
+RUN apt-get update && \
+    apt-get install -y vim \
+                       devscripts \
+                       software-properties-common
+
+# software-properties-common is needed for
+# add-apt-repository
+RUN add-apt-repository universe
+
+RUN apt-get clean
+RUN apt-get update && \
+    apt-get install -y equivs
+
+# Speed up mk-build-deps
+RUN apt-get clean
+RUN apt-get update && \
+    apt-get install -y -o Acquire::Retires=10 \
+        autoconf \
+        automake \
+        autopoint \
+        cmake \
+        libtool \
+        libdbus-1-dev \
+        libdbus-c++-dev \
+        libupnp-dev \
+        libgnutls28-dev \
+        libebook1.2-dev \
+        libclutter-gtk-1.0-dev \
+        libclutter-1.0-dev \
+        libglib2.0-dev \
+        libgtk-3-dev \
+        libnotify-dev \
+        qtbase5-dev \
+        qttools5-dev \
+        qttools5-dev-tools \
+        yasm \
+        autotools-dev \
+        gettext \
+        libpulse-dev \
+        libsamplerate0-dev \
+        libasound2-dev \
+        libexpat1-dev \
+        libpcre3-dev \
+        libyaml-cpp-dev \
+        libboost-dev \
+        libsndfile1-dev \
+        libxext-dev \
+        libxfixes-dev \
+        libspeex-dev \
+        libspeexdsp-dev \
+        uuid-dev \
+        libavcodec-dev \
+        libavutil-dev \
+        libavformat-dev \
+        libswscale-dev \
+        libavdevice-dev \
+        libopus-dev \
+        libudev-dev \
+        libgsm1-dev \
+        libjsoncpp-dev \
+        libnatpmp-dev \
+        libappindicator3-dev \
+        libqrencode-dev \
+        libnm-glib-dev \
+        libwebkit2gtk-4.0-dev \
+        libcrypto++-dev \
+        libva-dev
+
+ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
+
+CMD /opt/build-package-debian.sh