diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9cfcf0c46..213afd82b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ jobs:
     steps:
       - checkout
       - run: apt-get update
-      - 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 libavutil-dev libavformat-dev libswresample-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev libev-dev libssl-dev
+      - 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 libavutil-dev libavformat-dev libswresample-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev libev-dev libssl-dev libtag1-dev
       - run: cmake -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_DISTRO=artful -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .
       - run: make -j2
       - run: make package
@@ -36,7 +36,7 @@ jobs:
     steps:
       - checkout
       - run: apt-get update
-      - run: apt-get install build-essential clang cmake libboost-thread1.67-dev libboost-system1.67-dev libboost-filesystem1.67-dev libboost-date-time1.67-dev libboost-atomic1.67-dev libboost-chrono1.67-dev libogg-dev libvorbis-dev libavutil-dev libavformat-dev libswresample-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev libev-dev libssl-dev libtag1-dev
+      - run: apt-get install -y build-essential clang cmake libboost-thread1.67-dev libboost-system1.67-dev libboost-filesystem1.67-dev libboost-date-time1.67-dev libboost-atomic1.67-dev libboost-chrono1.67-dev libogg-dev libvorbis-dev libavutil-dev libavformat-dev libswresample-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev libev-dev libssl-dev libtag1-dev
       - run: cmake -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_DISTRO=cosmic -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .
       - run: make -j2
       - run: make package
@@ -53,7 +53,7 @@ jobs:
       - run: apt-get install sed
       - run: sed -i -e 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
       - run: apt-get update
-      - 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 libavutil-dev libavformat-dev libswresample-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev libev-dev libssl-dev
+      - run: apt-get install -y 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 libavutil-dev libavformat-dev libswresample-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev libev-dev libssl-dev libtag1-dev
       - run: cmake -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_DISTRO=zesty -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .
       - run: make -j2
       - run: make package
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbfbcb9dd..88ce36e98 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -237,6 +237,7 @@ if (GENERATE_DEB MATCHES "1")
     set(DEB_LIBCURL_VERSION "3")
     set(DEB_AVUTIL_VERSION "55")
     set(DEB_AVFORMAT_VERSION "57")
+    set(DEB_SWRESAMPLE_VERSION "2")
   if (DEB_DISTRO MATCHES "stretch")
       set(DEB_BOOST_VERSION "1.62.0")
       set(DEB_MICROHTTPD_VERSION "12")
@@ -250,12 +251,13 @@ if (GENERATE_DEB MATCHES "1")
       set(DEB_BOOST_VERSION "1.65.1")
       set(DEB_MICROHTTPD_VERSION "12")
       set(DEB_LIBCURL_VERSION "4")
-    elseif (DEB_DISTRO MATCHES "curious")
-      set(DEB_BOOST_VERSION "1.67.1")
+    elseif (DEB_DISTRO MATCHES "cosmic")
+      set(DEB_BOOST_VERSION "1.67.0")
       set(DEB_MICROHTTPD_VERSION "12")
       set(DEB_LIBCURL_VERSION "4")
       set(DEB_AVUTIL_VERSION "56")
       set(DEB_AVFORMAT_VERSION "58")
+      set(DEB_SWRESAMPLE_VERSION "3")
     elseif (DEB_DISTRO MATCHES "xenial")
       set(DEB_BOOST_VERSION "1.58.0")
       set(DEB_MICROHTTPD_VERSION "10")
@@ -268,7 +270,7 @@ if (GENERATE_DEB MATCHES "1")
     if (${FFMPEG_DECODER} MATCHES "false")
       set(DEPENDENCIES "${DEPENDENCIES}, libflac8, libfaad2")
     else()
-      set(DEPENDENCIES "${DEPENDENCIES}, libavcodec-extra, libavutil${DEB_AVUTIL_VERSION}, libavformat${DEB_AVFORMAT_VERSION}, libswresample2")
+      set(DEPENDENCIES "${DEPENDENCIES}, libavcodec-extra, libavutil${DEB_AVUTIL_VERSION}, libavformat${DEB_AVFORMAT_VERSION}, libswresample${DEB_SWRESAMPLE_VERSION}")
     endif()
 
     if (NOT ${USE_BUNDLED_TAGLIB} MATCHES "true")