diff --git a/packaging/CPackDebUploadPPA.cmake b/packaging/CPackDebUploadPPA.cmake
index 69af8e187a4..9a5f756f81f 100644
--- a/packaging/CPackDebUploadPPA.cmake
+++ b/packaging/CPackDebUploadPPA.cmake
@@ -88,12 +88,6 @@ endif()
 
 foreach(RELEASE ${CPACK_DEBIAN_DISTRIBUTION_RELEASES})
 
-  if (RELEASE STREQUAL "bionic")
-    set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "libmp4v2-dev,")
-  else()
-    set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "libavformat-dev,")
-  endif()
-
   configure_file(${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/packaging/debian/control.in
       ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/debian/control
       @ONLY)
diff --git a/packaging/debian/control.in b/packaging/debian/control.in
index a2600ce2f10..b770c5cd500 100644
--- a/packaging/debian/control.in
+++ b/packaging/debian/control.in
@@ -27,6 +27,7 @@ Build-Depends: debhelper (>= 11),
                libogg-dev,
                libsndfile1-dev,
                libasound2-dev,
+               libavformat-dev,
                libvorbis-dev,
                libfaad-dev,
                libportmidi-dev,
diff --git a/tools/debian_buildenv.sh b/tools/debian_buildenv.sh
index 95ef67967ec..d4543fc71ee 100755
--- a/tools/debian_buildenv.sh
+++ b/tools/debian_buildenv.sh
@@ -10,19 +10,6 @@ case "$1" in
         ;;
 
     setup)
-        source /etc/lsb-release 2>/dev/null
-        case "${DISTRIB_CODENAME}" in
-            bionic) # Ubuntu 18.04 LTS
-                PACKAGES_EXTRA=(
-                    libmp4v2-dev
-                )
-                ;;
-            *) # libmp4v2 was removed from Debian 10 & Ubuntu 20.04 due to lack of maintenance, so use FFMPEG instead
-                PACKAGES_EXTRA=(
-                    libavformat-dev
-                )
-        esac
-
         sudo apt-get update
 
         # If jackd2 is installed as per dpkg database, install libjack-jackd2-dev.
@@ -58,6 +45,7 @@ case "$1" in
             fonts-ubuntu \
             g++ \
             lcov \
+            libavformat-dev \
             libbenchmark-dev \
             libchromaprint-dev \
             libdistro-info-perl \