diff --git a/CMakeLists.txt b/CMakeLists.txt
index 82150410f..0668c1bee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.1)
 if(POLICY CMP0025)
 	cmake_policy(SET CMP0025 NEW)
 endif()
+if(POLICY CMP0072)
+	cmake_policy(SET CMP0072 NEW)
+endif()
 project(mGBA)
 set(BINARY_NAME mgba CACHE INTERNAL "Name of output binaries")
 if(NOT MSVC)
@@ -532,7 +535,11 @@ if(USE_FFMPEG)
 	set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libavformat${LIBAVFORMAT_VERSION_MAJOR}|libavformat-ffmpeg${LIBAVFORMAT_VERSION_MAJOR}")
 	if(USE_LIBSWRESAMPLE)
 		string(REGEX MATCH "^[0-9]+" LIBSWRESAMPLE_VERSION_MAJOR ${libswresample_VERSION})
-		math(EXPR LIBSWRESAMPLE_VERSION_DEBIAN "${LIBSWRESAMPLE_VERSION_MAJOR} - 1")
+		if(${libswresample_VERSION} EQUAL "3.1.100")
+			set(LIBSWRESAMPLE_VERSION_DEBIAN 3)
+		else()
+			math(EXPR LIBSWRESAMPLE_VERSION_DEBIAN "${LIBSWRESAMPLE_VERSION_MAJOR} - 1")
+		endif()
 		set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libswresample${LIBSWRESAMPLE_VERSION_DEBIAN}|libswresample-ffmpeg${LIBSWRESAMPLE_VERSION_DEBIAN}")
 	else()
 		string(REGEX MATCH "^[0-9]+" LIBAVRESAMPLE_VERSION_MAJOR ${libavresample_VERSION})
@@ -559,6 +566,8 @@ if(USE_MAGICK)
 	string(REGEX MATCH "^[0-9]+" MAGICKWAND_VERSION_MAJOR ${MagickWand_VERSION})
 	if(${MAGICKWAND_VERSION_PARTIAL} EQUAL "6.7")
 		set(MAGICKWAND_DEB_VERSION "5")
+	elseif(${MagickWand_VERSION} EQUAL "6.9.10")
+		set(MAGICKWAND_DEB_VERSION "-6.q16-6")
 	elseif(${MagickWand_VERSION} EQUAL "6.9.7")
 		set(MAGICKWAND_DEB_VERSION "-6.q16-3")
 	else()