diff --git a/Makefile.packaging b/Makefile.packaging
index 76ac8a352ccd3b6bfedb8d7bb38f7164192ec7b2..20c6796e648416362df2071b4209b6da6d08bfba 100644
--- a/Makefile.packaging
+++ b/Makefile.packaging
@@ -81,6 +81,8 @@ package-all: package-debian_8 \
              package-ubuntu_15.10_i386 \
              package-ubuntu_16.04 \
              package-ubuntu_16.04_i386 \
+             package-ubuntu_16.10 \
+             package-ubuntu_16.10_i386 \
              package-fedora_22 \
              package-fedora_22_i386 \
              package-fedora_23 \
diff --git a/docker/Dockerfile_ubuntu_16.10 b/docker/Dockerfile_ubuntu_16.10
new file mode 100644
index 0000000000000000000000000000000000000000..758f9394f4bbc1dcf4436585323446e6e661352b
--- /dev/null
+++ b/docker/Dockerfile_ubuntu_16.10
@@ -0,0 +1,76 @@
+FROM ubuntu:16.10
+
+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_16.10_i386 b/docker/Dockerfile_ubuntu_16.10_i386
new file mode 100644
index 0000000000000000000000000000000000000000..2db9463b9c6a5ec8c2b2d4de25a8b694c778865c
--- /dev/null
+++ b/docker/Dockerfile_ubuntu_16.10_i386
@@ -0,0 +1,76 @@
+FROM savoirfairelinux/ring-ubuntu32:16.10
+
+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/scripts/make-packaging-target.py b/scripts/make-packaging-target.py
index 430e326a35d411a9ef1734cde7092daf82f0a1c0..a2c4ea29f555be830fb2359b17236c74f401c6d8 100755
--- a/scripts/make-packaging-target.py
+++ b/scripts/make-packaging-target.py
@@ -140,6 +140,16 @@ def run_generate_all(parsed_args):
             "debian_packaging_override": "",
             "output_file": "$(DEBIAN_DSC_FILENAME)",
         },
+        {
+            "distribution": "ubuntu_16.10",
+            "debian_packaging_override": "",
+            "output_file": "$(DEBIAN_DSC_FILENAME)",
+        },
+        {
+            "distribution": "ubuntu_16.10_i386",
+            "debian_packaging_override": "",
+            "output_file": "$(DEBIAN_DSC_FILENAME)",
+        },
         # Fedora
         {
             "distribution": "fedora_22",