diff --git a/meson-disable-untested-code.patch b/meson-disable-untested-code.patch
new file mode 100644
index 0000000..b15a938
--- /dev/null
+++ b/meson-disable-untested-code.patch
@@ -0,0 +1,13 @@
+Index: meson-0.39.1/test cases/frameworks/7 gnome/resources/meson.build
+===================================================================
+---	meson-0.39.1.orig/test cases/frameworks/7 gnome/resources/meson.build
++++	meson-0.39.1/test cases/frameworks/7 gnome/resources/meson.build
+@@ -29,7 +29,7 @@ gnome.compile_resources('simple-resource
+ )
+ test('simple resource test (gresource)', find_program('resources.py'))
+ 
+-if glib.version() >= '2.52.0'
++if glib.version() >= '9.99.9'
+   # This test cannot pass if GLib version is older than 9.99.9.
+   # Meson will raise an error if the user tries to use the 'dependencies'
+   # argument and the version of GLib is too old for generated resource
diff --git a/meson.changes b/meson.changes
index 2147cb6..7d56bef 100644
--- a/meson.changes
+++ b/meson.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Mar 20 11:21:10 UTC 2017 - dimstar@opensuse.org
+
+- Add meson-disable-untested-code.patch: meson has code in the test
+  suite that assumes different behaviour between glib 2.51.5 (rc)
+  and 2.52.0 (final); this must be a wrong assumption to start with
+  and the test suite fails with 2.52.20. When this was added by
+  upstream 4 months before glib-2.52.0 was released, there must
+  have been no way at all to test this. We revert back to a state
+  like with the previous glib verison, where this test was simply
+  skipped (gh#mesonbuild/meson#1480).
+
 -------------------------------------------------------------------
 Thu Mar 16 11:04:13 UTC 2017 - sor.alexei@meowr.ru
 
diff --git a/meson.spec b/meson.spec
index 9459bf3..ebb19f1 100644
--- a/meson.spec
+++ b/meson.spec
@@ -31,6 +31,8 @@ Source2:        %{name}.keyring
 Patch0:         meson-suse-ify-macros.patch
 # PATCH-FIX-OPENSUSE meson-fix-gcc48.patch sor.alexei@meowr.ru -- Fix GCC 4.8 handling for openSUSE Leap 42.x.
 Patch1:         meson-fix-gcc48.patch
+# PATCH-FIX-UPSTREAM meson-disable-untested-code.patch gh#mesonbuild/meson#1480 dimstar@opensuse.org -- Do not assume that the untested meson test works with glib 2.52.0
+Patch2:         meson-disable-untested-code.patch
 BuildRequires:  bison
 BuildRequires:  boost-devel
 BuildRequires:  flex
@@ -77,6 +79,7 @@ Domain Specific Language.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # Lack of gtest, gmock, gnustep.
 rm -rf "test cases/frameworks/2 gtest" \