diff --git a/llvm.changes b/llvm.changes
index bbcdc61..5af69b1 100644
--- a/llvm.changes
+++ b/llvm.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Apr 11 09:33:46 UTC 2016 - dimstar@opensuse.org
+
+- Change condition to apply glibc-2.23 patch:
+  + Base it on the version of glibc: if > 2.22.9999, apply the
+    patch.
+  + Add zypper BuildRequires: this is the most reasonable way to
+    reliably compare rpm version numbers.
+
 -------------------------------------------------------------------
 Mon Apr 11 08:45:56 UTC 2016 - idonmez@suse.com
 
diff --git a/llvm.spec b/llvm.spec
index 357a425..bfbbda8 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -86,6 +86,8 @@ BuildRequires:  ncurses-devel
 BuildRequires:  ninja
 BuildRequires:  python-base
 BuildRequires:  python-xml
+# zypper is only needed to identify if patch10 should be applied
+BuildRequires:  zypper
 # llvm does not work on ppc or s390
 ExcludeArch:    ppc s390
 
@@ -182,9 +184,9 @@ disassembler.
 %patch7
 %patch8 -p1
 %patch9
-%if 0%{?suse_version} > 1320
+if zypper vcmp $(rpm -q --qf "%{version}" glibc) 2.22.9999 | grep "is newer"; then
 %patch10
-%endif
+fi
 
 # Move into right place
 mv cfe-%{version}.src tools/clang