diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4dda2ad9c..7f00fd5da 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,5 +1,16 @@
 version: 2.0
 jobs:
+  build_ubuntu_xenial:
+    docker:
+      - image: ubuntu:xenial
+    steps:
+      - checkout
+      - run: apt-get update
+      - run: apt-get install -y build-essential clang cmake libboost-thread1.58-dev libboost-system1.58-dev libboost-filesystem1.58-dev libboost-date-time1.58-dev libboost-atomic1.58-dev libboost-chrono1.58-dev libogg-dev libvorbis-dev libflac-dev libfaad-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev
+      - run: cmake -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_DISTRO=xenial -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .
+      - run: make && make package
+      - store_artifacts:
+          path: /root/project/*.deb
   build_ubuntu_artful:
     docker:
       - image: ubuntu:artful
@@ -9,7 +20,8 @@ jobs:
       - run: apt-get install -y build-essential clang cmake libboost-thread1.63-dev libboost-system1.63-dev libboost-filesystem1.63-dev libboost-date-time1.63-dev libboost-atomic1.63-dev libboost-chrono1.63-dev libogg-dev libvorbis-dev libflac-dev libfaad-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev
       - run: cmake -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_DISTRO=artful -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .
       - run: make && make package
-      - run: mv *.deb $CIRCLE_ARTIFACTS/
+      - store_artifacts:
+          path: /root/project/*.deb
   build_ubuntu_zesty:
     docker:
       - image: ubuntu:zesty
@@ -19,7 +31,8 @@ jobs:
       - run: apt-get -y install build-essential clang cmake libboost-thread1.61-dev libboost-system1.61-dev libboost-filesystem1.61-dev libboost-date-time1.61-dev libboost-atomic1.61-dev libboost-chrono1.61-dev libogg-dev libvorbis-dev libflac-dev libfaad-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev
       - run: cmake -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_DISTRO=zesty -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .
       - run: make && make package
-      - run: mv *.deb $CIRCLE_ARTIFACTS/
+      - store_artifacts:
+          path: /root/project/*.deb
 
 workflows:
   version: 2
@@ -27,3 +40,4 @@ workflows:
     jobs:
       - build_ubuntu_artful
       - build_ubuntu_zesty
+      - build_ubuntu_xenial
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a2c411dd..b02ec4e02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,6 +205,9 @@ if (GENERATE_DEB MATCHES "1")
     elseif (DEB_DISTRO MATCHES "artsy")
       set(DEB_BOOST_VERSION "1.63.0")
       set(DEB_MICROHTTPD_VERSION "12")
+    elseif (DEB_DISTRO MATCHES "xenial")
+      set(DEB_BOOST_VERSION "1.58.0")
+      set(DEB_MICROHTTPD_VERSION "10")
     endif()
 
     set(CPACK_GENERATOR "DEB")