diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
index f75bf1b06..a8bed529b 100644
--- a/.github/workflows/smoke.yml
+++ b/.github/workflows/smoke.yml
@@ -35,10 +35,10 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: ubuntu-24.04, python: "3.14t", ffmpeg: "8.0", extras: true}
-          - {os: ubuntu-24.04, python: "3.12", ffmpeg: "8.0", extras: true}
-          - {os: ubuntu-24.04, python: "pypy3.10", ffmpeg: "8.0"}
-          - {os: macos-14, python: "3.10", ffmpeg: "8.0"}
+          - {os: ubuntu-24.04, python: "3.14t", ffmpeg: "8.0.1", extras: true}
+          - {os: ubuntu-24.04, python: "3.12", ffmpeg: "8.0.1", extras: true}
+          - {os: ubuntu-24.04, python: "pypy3.10", ffmpeg: "8.0.1"}
+          - {os: macos-14, python: "3.10", ffmpeg: "8.0.1"}
 
     env:
       PYAV_PYTHON: python${{ matrix.config.python }}
@@ -76,7 +76,7 @@ jobs:
             fi
             ;;
           macos-14)
-            brew install automake libtool nasm libpng libvorbis libvpx opus x264
+            brew install automake libtool libpng libvorbis libvpx opus x264
             ;;
         esac
 
@@ -149,7 +149,6 @@ jobs:
         . $CONDA/etc/profile.d/conda.sh
         conda activate pyav
         python scripts\\fetch-vendor.py --config-file scripts\\ffmpeg-${{ matrix.config.ffmpeg }}.json $CONDA_PREFIX\\Library
-        python scripts\\comptime.py  ${{ matrix.config.ffmpeg }}
         python setup.py build_ext --inplace --ffmpeg-dir=$CONDA_PREFIX\\Library
 
     - name: Test
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index dce62d944..f02f3ea44 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -16,6 +16,22 @@ We are operating with `semantic versioning <https://semver.org>`_.
     Note that they these tags will not actually close the issue/PR until they
     are merged into the "default" branch.
 
+
+next
+----
+
+Features:
+
+- Add AMD AMF hardware decoding by :gh-user:`ladaapp2`.
+- Add subtitle encoding support by :gh-user:`skeskinen` in (:pr:`2050`).
+- Add read/write access to PacketSideData by :gh-user:`skeskinen` in (:pr:`2051`).
+- Add yuv422p support for video frame to_ndarray and from_ndarray by :gh-user:`wader` in (:pr:`2054`).
+- Add binding for ``avcodec_find_best_pix_fmt_of_list()`` by :gh-user:`ndeybach` (:pr:`2058`).
+
+Fixes:
+
+- Fix #2036, #2053, #2057 by :gh-user:`WyattBlue`.
+
 v16.0.1
 -------
 
@@ -34,7 +50,7 @@ Major:
 Features:
 
 - Add ``Filter.Context.process_command()`` method by :gh-user:`caffeinism` in (:pr:`2000`).
-- Add packet side-data handling mechanism by :gh-user:`tikuma-lsuhsc ` in (:pr:`2003`).
+- Add packet side-data handling mechanism by :gh-user:`tikuma-lsuhsc` in (:pr:`2003`).
 - Implemented set_chapters method by :gh-user:`DE-AI` in (:pr:`2004`).
 - Declare free-threaded support and support 3.13t by :gh-user:`ngoldbaum` in (:pr:`2005`).
 - Add writable and copyable attachment and data streams by :gh-user:`skeskinen` in (:pr:`2026`).
diff --git a/docs/api/filter.rst b/docs/api/filter.rst
index d126fda67..8674fdd9e 100644
--- a/docs/api/filter.rst
+++ b/docs/api/filter.rst
@@ -24,11 +24,3 @@ Filters
     .. autoclass:: FilterLink
         :members:
 
-
-.. automodule:: av.filter.pad
-
-    .. autoclass:: FilterPad
-        :members:
-
-    .. autoclass:: FilterContextPad
-        :members:
diff --git a/scripts/build b/scripts/build
index 4ee15d003..e3bd7a073 100755
--- a/scripts/build
+++ b/scripts/build
@@ -22,5 +22,4 @@ ffmpeg -version || exit 3
 echo
 
 $PYAV_PIP install -U --pre cython setuptools 2> /dev/null
-"$PYAV_PYTHON" scripts/comptime.py
 "$PYAV_PYTHON" setup.py config build_ext --inplace || exit 1
diff --git a/scripts/comptime.py b/scripts/comptime.py
deleted file mode 100644
index a03a465f9..000000000
--- a/scripts/comptime.py
+++ /dev/null
@@ -1,32 +0,0 @@
-import os
-import sys
-
-def replace_in_file(file_path):
-    try:
-        with open(file_path, "r", encoding="utf-8") as file:
-            content = file.read()
-
-        modified_content = content.replace("# [FFMPEG6] ", "")
-
-        with open(file_path, "w") as file:
-            file.write(modified_content)
-    except UnicodeDecodeError:
-        pass
-
-
-def process_directory(directory):
-    for root, dirs, files in os.walk(directory):
-        for file in files:
-            file_path = os.path.join(root, file)
-            replace_in_file(file_path)
-
-
-version = os.environ.get("PYAV_LIBRARY")
-if version is None:
-    is_6 = sys.argv[1].startswith("6")
-else:
-    is_6 = version.startswith("ffmpeg-6")
-
-if is_6:
-    process_directory("av")
-    process_directory("include")
diff --git a/scripts/ffmpeg-8.0.json b/scripts/ffmpeg-8.0.json
index fc5719b8a..f8af81c7a 100644
--- a/scripts/ffmpeg-8.0.json
+++ b/scripts/ffmpeg-8.0.json
@@ -1,3 +1,3 @@
 {
-    "url": "https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/8.0-2/ffmpeg-{platform}.tar.gz"
+    "url": "https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/8.0.1-1/ffmpeg-{platform}.tar.gz"
 }
diff --git a/scripts/ffmpeg-latest.json b/scripts/ffmpeg-latest.json
index fc5719b8a..f8af81c7a 100644
--- a/scripts/ffmpeg-latest.json
+++ b/scripts/ffmpeg-latest.json
@@ -1,3 +1,3 @@
 {
-    "url": "https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/8.0-2/ffmpeg-{platform}.tar.gz"
+    "url": "https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/8.0.1-1/ffmpeg-{platform}.tar.gz"
 }