diff --git a/ghc-armv7-VFPv3D16--NEON.patch b/ghc-armv7-VFPv3D16--NEON.patch
new file mode 100644
index 0000000..bc1255b
--- /dev/null
+++ b/ghc-armv7-VFPv3D16--NEON.patch
@@ -0,0 +1,11 @@
+--- ghc-8.10.7/aclocal.m4
++++ ghc-8.10.7/aclocal.m4
+@@ -408,7 +408,7 @@
+                 )],
+                 [changequote(, )dnl
+                  ARM_ISA=ARMv7
+-                 ARM_ISA_EXT="[VFPv3,NEON]"
++                 ARM_ISA_EXT="[VFPv3D16]"
+                  changequote([, ])dnl
+                 ])
+         ])
diff --git a/ghc.changes b/ghc.changes
index f777a07..f60f8d1 100644
--- a/ghc.changes
+++ b/ghc.changes
@@ -1,9 +1,20 @@
+-------------------------------------------------------------------
+Mon Jun 27 17:04:51 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- add ghc.keyring to have source validation enabled
+- limit to use llvm12 for Factory as newer versions are not supported
+
 -------------------------------------------------------------------
 Fri Apr 29 13:49:29 UTC 2022 - Martin Liška <mliska@suse.cz>
 
 - Remove dependency on binutils-gold as the package will be removed
   in the future. Gold linker is unmaintained by the upstream project.
 
+-------------------------------------------------------------------
+Tue Mar  8 22:35:07 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- add ghc-armv7-VFPv3D16--NEON.patch to use vfpv3-d16 on armv7hl
+
 -------------------------------------------------------------------
 Fri Sep  3 20:57:29 UTC 2021 - Ondřej Súkup <mimi.vx@gmail.com>
 
diff --git a/ghc.keyring b/ghc.keyring
new file mode 100644
index 0000000..d931204
--- /dev/null
+++ b/ghc.keyring
@@ -0,0 +1,41 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=AZOC
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/ghc.spec b/ghc.spec
index 9361af6..a5e807f 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -23,6 +23,11 @@
 %endif
 
 %global unregisterised_archs s390 s390x riscv64
+%if 0%{suse_version} > 1550
+%global llvm_major 12
+%else
+%global llvm_major 9
+%endif
 %define full_version 8.10.7
 
 Name:           ghc
@@ -32,6 +37,7 @@ URL:            https://www.haskell.org/ghc/
 Source:         https://downloads.haskell.org/~ghc/%{full_version}/ghc-%{version}-src.tar.xz
 Source1:        https://downloads.haskell.org/~ghc/%{full_version}/ghc-%{version}-src.tar.xz.sig
 Source2:        ghc-rpmlintrc
+Source9:        ghc.keyring
 Summary:        The Glorious Glasgow Haskell Compiler
 License:        BSD-3-Clause
 Group:          Development/Languages/Other
@@ -51,9 +57,9 @@ BuildRequires:  ncurses-devel
 BuildRequires:  pkg-config
 BuildRequires:  xz
 %ifarch aarch64 %{arm}
-BuildRequires:  clang >= 9
-BuildRequires:  llvm >= 9
-BuildRequires:  llvm-devel >= 9
+BuildRequires:  clang%{llvm_major}
+BuildRequires:  llvm%{llvm_major}
+BuildRequires:  llvm%{llvm_major}-devel
 %endif
 %if %{undefined without_manual}
 BuildRequires:  python3-Sphinx
@@ -68,7 +74,8 @@ PreReq:         update-alternatives
 Requires:       ghc-compiler = %{version}-%{release}
 Requires:       ghc-ghc-devel = %{version}-%{release}
 Requires:       ghc-libraries = %{version}-%{release}
-
+# PATCH-FIX-OPENSUSE: use vfpv3-d16 and disable NEON
+Patch2:         ghc-armv7-VFPv3D16--NEON.patch
 # PATCH-FIX-UPSTREAM Disable-unboxed-arrays.patch ptrommler@icloud.com -- Do not use unboxed arrays on big-endian platforms. See Haskell Trac #15411.
 Patch3:         Disable-unboxed-arrays.patch
 # PATCH-FIX-UPSTREAM ghc-pie.patch - set linux as default PIE platform
@@ -103,12 +110,14 @@ Requires:       ghc-base-devel
 Requires(post): update-alternatives
 Requires(postun):update-alternatives
 %ifarch aarch64 %{arm}
-Requires:       clang9
-Requires:       llvm9
+Requires:       binutils-gold
 %endif
-%ifarch x86_64 %{ix86}
-Suggests:       clang9
-Suggests:       llvm9
+%ifarch aarch64 %{arm}
+Requires:       clang%{llvm_major}
+Requires:       llvm%{llvm_major}
+%else
+Suggests:       clang%{llvm_major}
+Suggests:       llvm%{llvm_major}
 %endif
 
 %description compiler
@@ -180,6 +189,7 @@ except the ghc library, which is installed by the toplevel ghc metapackage.
 
 %prep
 %setup -q
+%patch2 -p1
 %ifarch ppc64 s390 s390x
 %patch3 -p1
 %endif