diff --git a/postgresql12.changes b/postgresql12.changes
index 3d9c8ef..f9b61fa 100644
--- a/postgresql12.changes
+++ b/postgresql12.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb 14 07:53:46 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Disable explicitly armv8 CRC for %arm, as we use some armv8
+  workers for armv6/7 builds which is confusing configure script
+
 -------------------------------------------------------------------
 Tue Feb 11 04:15:40 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 
diff --git a/postgresql12.spec b/postgresql12.spec
index 2e73a8b..a5c3b8a 100644
--- a/postgresql12.spec
+++ b/postgresql12.spec
@@ -432,6 +432,9 @@ find -name .gitignore -delete
 %build
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
 export PYTHON=python3
+%ifarch %arm
+export USE_ARMV8_CRC32C=0
+%endif
 PACKAGE_TARNAME=%pgname %configure \
         --bindir=%pgbindir \
         --libdir=%pglibdir \