diff --git a/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch b/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch
deleted file mode 100644
index cd46824c39..0000000000
--- a/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d36e65f3e31c882f62d5cfeb7b0e1441d5fdc821 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Sat, 14 Apr 2018 16:15:59 +0800
-Subject: [PATCH] drop zenity detection
-
-OE does not support zenity
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- configure.ac | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index bbb4db8..2010d78 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -336,11 +336,6 @@ fi
- 
- AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes") 
- 
--AC_PATH_PROG(ZENITY, zenity, no)
--if test x"$ZENITY" = xno; then
--  AC_MSG_ERROR([zenity not found in your path - needed for dialogs])
--fi
--
- AC_SEARCH_LIBS([dlsym], [dl], [], [
-   AC_MSG_ERROR([unable to find the dlsym() function])
- ])
diff --git a/meta-gnome/recipes-gnome/metacity/metacity_3.56.0.bb b/meta-gnome/recipes-gnome/metacity/metacity_3.58.1.bb
similarity index 87%
rename from meta-gnome/recipes-gnome/metacity/metacity_3.56.0.bb
rename to meta-gnome/recipes-gnome/metacity/metacity_3.58.1.bb
index b8b248ba3a..f364b52b98 100644
--- a/meta-gnome/recipes-gnome/metacity/metacity_3.56.0.bb
+++ b/meta-gnome/recipes-gnome/metacity/metacity_3.58.1.bb
@@ -24,8 +24,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
 GNOMEBASEBUILDCLASS = "autotools"
 inherit gnomebase gsettings gettext upstream-version-is-even features_check
 
-SRC_URI[archive.sha256sum] = "7554997104b26ff0e79a02b37a2ba189bdf4e7ccd54226f0faf4b1a59006c901"
-SRC_URI += "file://0001-drop-zenity-detection.patch"
+SRC_URI[archive.sha256sum] = "e430c8a92409ef2f91a4dabd50a71e3d3bbcc474a3dec1caec3813b381d7d1b0"
 
 PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama"
 # enable as neccessary until new warnings are dealt with
@@ -35,6 +34,7 @@ FILES:${PN} += " \
     ${datadir}/themes \
     ${datadir}/gnome-control-center \
     ${datadir}/gnome\
+    ${systemd_user_unitdir} \
 "
 
 RDEPENDS:${PN} += "gsettings-desktop-schemas"