diff -Nru ffmpeg-4.4/debian/changelog ffmpeg-4.4/debian/changelog
--- ffmpeg-4.4/debian/changelog	2021-09-09 20:45:41.000000000 +0000
+++ ffmpeg-4.4/debian/changelog	2021-10-28 16:40:55.000000000 +0000
@@ -1,3 +1,16 @@
+ffmpeg (7:4.4-6+rpi2) bookworm-staging; urgency=medium
+
+  * Use -march=armv6+fp rather than -march=armv6
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 28 Oct 2021 16:40:55 +0000
+
+ffmpeg (7:4.4-6+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 7:4.4-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 05 Sep 2021 20:59:14 +0000]
+  * Link with libatomic on armhf too.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 23 Sep 2021 15:40:00 +0000
+
 ffmpeg (7:4.4-6) unstable; urgency=medium
 
   * debian/*.symbols: Bump version of symbols to match upstream release
diff -Nru ffmpeg-4.4/debian/patches/series ffmpeg-4.4/debian/patches/series
--- ffmpeg-4.4/debian/patches/series	2021-08-08 19:15:13.000000000 +0000
+++ ffmpeg-4.4/debian/patches/series	2021-10-28 16:40:55.000000000 +0000
@@ -1 +1,2 @@
 0001-avcodec-arm-sbcenc-avoid-callee-preserved-vfp-regist.patch
+use-armv6+fp-instead-of-armv6.patch
diff -Nru ffmpeg-4.4/debian/patches/use-armv6+fp-instead-of-armv6.patch ffmpeg-4.4/debian/patches/use-armv6+fp-instead-of-armv6.patch
--- ffmpeg-4.4/debian/patches/use-armv6+fp-instead-of-armv6.patch	1970-01-01 00:00:00.000000000 +0000
+++ ffmpeg-4.4/debian/patches/use-armv6+fp-instead-of-armv6.patch	2021-10-28 16:40:55.000000000 +0000
@@ -0,0 +1,14 @@
+Description:  Use -march=armv6+fp rather than -march=armv6
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+--- ffmpeg-4.4.orig/configure
++++ ffmpeg-4.4/configure
+@@ -4966,7 +4966,7 @@ elif enabled arm; then
+         elif check_arm_arch 5T;       then echo armv5t
+         elif check_arm_arch 5TE;      then echo armv5te
+         elif check_arm_arch 5TEJ;     then echo armv5te
+-        elif check_arm_arch 6;        then echo armv6
++        elif check_arm_arch 6;        then echo armv6+fp
+         elif check_arm_arch 6J;       then echo armv6j
+         elif check_arm_arch 6K;       then echo armv6k
+         elif check_arm_arch 6Z;       then echo armv6z
diff -Nru ffmpeg-4.4/debian/rules ffmpeg-4.4/debian/rules
--- ffmpeg-4.4/debian/rules	2021-08-22 19:05:42.000000000 +0000
+++ ffmpeg-4.4/debian/rules	2021-09-23 15:40:00.000000000 +0000
@@ -79,7 +79,7 @@
 	--enable-sdl2
 
 # link with -latomic on armel and mipsel (https://trac.ffmpeg.org/ticket/9275)
-ifneq (,$(filter armel mipsel,$(DEB_HOST_ARCH)))
+ifneq (,$(filter armel armhf mipsel,$(DEB_HOST_ARCH)))
 CONFIG += --extra-libs=-latomic
 endif