diff --git a/common/shlibs b/common/shlibs
index a3be50d4e0..29c7d52b25 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1312,7 +1312,7 @@ libkworkspace5.so.5 kworkspace-5.14.5_2
 libdb-5.3.so libdb-5.3.21_1
 libdb_cxx-5.3.so libdb-cxx-5.3.21_1
 libcares.so.2 c-ares-1.10.0_1
-libcryptopp.so.5.6 crypto++-565_1
+libcryptopp.so.8 crypto++-820_1
 libphonon.so.4 phonon-4.6.0_1
 libphononexperimental.so.4 phonon-4.6.0_1
 libdbusmenu-glib.so.4 libdbusmenu-glib-12.10.2_1
diff --git a/srcpkgs/crypto++/patches/arm-native.patch b/srcpkgs/crypto++/patches/arm-native.patch
deleted file mode 100644
index ff7678735d..0000000000
--- a/srcpkgs/crypto++/patches/arm-native.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- GNUmakefile.orig
-+++ GNUmakefile
-@@ -125,23 +125,6 @@
-  endif
- endif
- 
--# Guard use of -march=native
--ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10)
--   CXXFLAGS += -march=native
--else ifneq ($(CLANG_COMPILER)$(INTEL_COMPILER),00)
--   CXXFLAGS += -march=native
--else
--  # GCC 3.3 and "unknown option -march="
--  # Ubuntu GCC 4.1 compiler crash with -march=native
--  # NetBSD GCC 4.8 compiler and "bad value (native) for -march= switch"
--  # Sun compiler is handled below
--  ifeq ($(SUN_COMPILER)$(IS_X64),01)
--    CXXFLAGS += -m64
--  else ifeq ($(SUN_COMPILER)$(IS_X86),01)
--    CXXFLAGS += -m32
--  endif # X86/X32/X64
--endif
--
- # Aligned access required for -O3 and above due to vectorization
- UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h)
- ifneq ($(UNALIGNED_ACCESS),0)
diff --git a/srcpkgs/crypto++/patches/musl-soname-links.patch b/srcpkgs/crypto++/patches/musl-soname-links.patch
deleted file mode 100644
index 34f3b4fbfe..0000000000
--- a/srcpkgs/crypto++/patches/musl-soname-links.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- GNUmakefile.orig	2017-09-22 10:27:03.000000000 +0000
-+++ GNUmakefile	2017-09-22 10:34:42.897537258 +0000
-@@ -581,6 +581,7 @@
- 	-$(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
- ifeq ($(HAS_SOLIB_VERSION),1)
- 	-$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
-+	-$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
- 	$(LDCONF) $(DESTDIR)$(LIBDIR)
- endif
- endif
diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template
index bce3e38a96..9fc17a0d4f 100644
--- a/srcpkgs/crypto++/template
+++ b/srcpkgs/crypto++/template
@@ -1,20 +1,24 @@
-# Template build file for 'crypto++'.
+# Template file for 'crypto++'
 pkgname=crypto++
-version=565
-revision=3
+version=820
+revision=1
 create_wrksrc=yes
 build_style=gnu-makefile
 make_build_target="libcryptopp.so libcryptopp.a"
 hostmakedepends="unzip"
-short_desc="A free C++ class library of cryptographic schemes"
+short_desc="Free C++ class library of cryptographic schemes"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSL-1.0"
 homepage="http://www.cryptopp.com/"
-license="Boost Software License 1.0, Public domain"
 distfiles="http://www.cryptopp.com/cryptopp${version}.zip"
-checksum=a75ef486fe3128008bbb201efee3dcdcffbe791120952910883b26337ec32c34
+checksum=03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058
 
 CXXFLAGS="-DNDEBUG -fPIC"
 
+if [ "$XBPS_CROSS" ]; then
+	make_build_args="-f GNUmakefile-cross"
+fi
+
 post_extract() {
 	sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
 }