diff -Nru libcrypto++-8.6.0/debian/changelog libcrypto++-8.6.0/debian/changelog
--- libcrypto++-8.6.0/debian/changelog	2021-09-25 17:44:37.000000000 +0000
+++ libcrypto++-8.6.0/debian/changelog	2021-12-19 20:21:58.000000000 +0000
@@ -1,3 +1,10 @@
+libcrypto++ (8.6.0-2ubuntu1) jammy; urgency=medium
+
+  * debian/patches/correct-arm-arch.patch: Use the correct architecture
+    target for armhf.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 19 Dec 2021 12:21:58 -0800
+
 libcrypto++ (8.6.0-2) unstable; urgency=medium
 
   * Fix armel and armhf link breakage.
diff -Nru libcrypto++-8.6.0/debian/control libcrypto++-8.6.0/debian/control
--- libcrypto++-8.6.0/debian/control	2021-09-25 17:44:30.000000000 +0000
+++ libcrypto++-8.6.0/debian/control	2021-12-19 20:21:58.000000000 +0000
@@ -1,7 +1,8 @@
 Source: libcrypto++
 Section: libs
 Priority: optional
-Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.org>
 Standards-Version: 4.6.0
 Build-Depends: debhelper-compat (= 13), automake, autoconf, libtool
 Build-Depends-Indep: doxygen
diff -Nru libcrypto++-8.6.0/debian/patches/correct-arm-arch.patch libcrypto++-8.6.0/debian/patches/correct-arm-arch.patch
--- libcrypto++-8.6.0/debian/patches/correct-arm-arch.patch	1970-01-01 00:00:00.000000000 +0000
+++ libcrypto++-8.6.0/debian/patches/correct-arm-arch.patch	2021-12-19 20:21:44.000000000 +0000
@@ -0,0 +1,25 @@
+Description: Use the correct architecture target for armhf.
+Author: Steve Langasek <steve.langasek@ubuntu.com>
+Last-Update: 2021-12-19
+Forwarded: no
+
+Index: libcrypto++-8.6.0/GNUmakefile
+===================================================================
+--- libcrypto++-8.6.0.orig/GNUmakefile
++++ libcrypto++-8.6.0/GNUmakefile
+@@ -1174,11 +1174,11 @@
+ # Also see https://www.cryptopp.com/wiki/Cryptogams.
+ ifeq ($(IS_ARM32)$(IS_LINUX),11)
+   ifeq ($(CLANG_COMPILER),1)
+-    CRYPTOGAMS_ARMV4_FLAG = -march=armv7-a -Wa,--noexecstack
+-    CRYPTOGAMS_ARMV4_THUMB_FLAG = -march=armv7-a -mthumb -Wa,--noexecstack
++    CRYPTOGAMS_ARMV4_FLAG = -march=armv7-a+fp -Wa,--noexecstack
++    CRYPTOGAMS_ARMV4_THUMB_FLAG = -march=armv7-a+fp -mthumb -Wa,--noexecstack
+   else
+-    CRYPTOGAMS_ARMV4_FLAG = -march=armv7-a -Wa,--noexecstack
+-    CRYPTOGAMS_ARMV4_THUMB_FLAG = -march=armv7-a -Wa,--noexecstack
++    CRYPTOGAMS_ARMV4_FLAG = -march=armv7-a+fp -Wa,--noexecstack
++    CRYPTOGAMS_ARMV4_THUMB_FLAG = -march=armv7-a+fp -Wa,--noexecstack
+   endif
+   SRCS += aes_armv4.S sha1_armv4.S sha256_armv4.S sha512_armv4.S
+ endif
diff -Nru libcrypto++-8.6.0/debian/patches/series libcrypto++-8.6.0/debian/patches/series
--- libcrypto++-8.6.0/debian/patches/series	2021-09-25 17:38:20.000000000 +0000
+++ libcrypto++-8.6.0/debian/patches/series	2021-12-19 20:20:29.000000000 +0000
@@ -1 +1,2 @@
 fix_library_name.patch
+correct-arm-arch.patch