diff --git a/_service b/_service
new file mode 100644
index 0000000..6ba6183
--- /dev/null
+++ b/_service
@@ -0,0 +1,14 @@
+<services>
+  <service mode="disabled" name="tar_scm">
+    <param name="url">https://gitlab.gnome.org/GNOME/mutter.git</param>
+    <param name="scm">git</param>
+    <param name="revision">gnome-3-28</param>
+    <param name="versionformat">3.28.1+%cd.%h</param>
+    <param name="changesgenerate">enable</param>
+  </service>
+  <service mode="disabled" name="recompress">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+  <service mode="disabled" name="set_version" />
+</services>
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..f73bd8e
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">https://gitlab.gnome.org/GNOME/mutter.git</param>
+              <param name="changesrevision">d3d5eb8e1b3b07a38860a9dbe58c601392e0ad75</param></service></servicedata>
\ No newline at end of file
diff --git a/mutter-3.28.0.tar.xz b/mutter-3.28.0.tar.xz
deleted file mode 100644
index 3bdbce0..0000000
--- a/mutter-3.28.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:58fffc8025f21fb6da27bd2189b6db4d20c54f950b1a46aa7f7cbf0a82d386b0
-size 3690644
diff --git a/mutter-3.28.1+20180416.d3d5eb8e1.tar.xz b/mutter-3.28.1+20180416.d3d5eb8e1.tar.xz
new file mode 100644
index 0000000..017a40c
--- /dev/null
+++ b/mutter-3.28.1+20180416.d3d5eb8e1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54f01ed9645af556f27f9a218a2c4124de0ea485c31b05e0a596a676a0c3d376
+size 2870432
diff --git a/mutter.changes b/mutter.changes
index 6f1dd5b..e66aa08 100644
--- a/mutter.changes
+++ b/mutter.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Apr 18 12:17:18 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 3.28.1+20180416.d3d5eb8e1:
+  + idle-monitor: Add ResetIdletime API, for testing purposes
+  + backend: Reset idle when lid is opened or resuming from suspend
+  + idle-monitor: Take idle inhibition into account
+  + x11: Allow XTest and core events to reset idletime
+  + backends: Remove X11 idle-monitor backend
+  + wayland: Plug surface pending state contents leak
+  + monitor-manager: fix output ids returned by GetResources
+  + native: Disable the use of KMS modifiers by default
+  + Updated translations.
+- Switch back to using git-checkout via source-service, upstream
+  seems unable to produce tarballs.
+- Following the above, add libtool BuildRequires and pass
+  autogen.sh to bootstrap.
+
 -------------------------------------------------------------------
 Thu Mar 22 20:04:16 CET 2018 - hpj@suse.com
 
diff --git a/mutter.spec b/mutter.spec
index 6e73b00..9a99285 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -19,13 +19,14 @@
 %define mutter_major 2
 %define mutter_minor 0
 Name:           mutter
-Version:        3.28.0
+Version:        3.28.1+20180416.d3d5eb8e1
 Release:        0
 Summary:        Window and compositing manager based on Clutter
 License:        GPL-2.0-or-later
 Group:          System/GUI/GNOME
 URL:            https://www.gnome.org
-Source0:        http://download.gnome.org/sources/mutter/3.28/%{name}-%{version}.tar.xz
+#Source0:       http://download.gnome.org/sources/mutter/3.28/%%{name}-%%{version}.tar.xz
+Source:         %{name}-%{version}.tar.xz
 # PATCH-FIX-UPSTREAM mutter-fix-startup.patch bgo#768531 zaitor@opensuse.org -- Fix slow startup notification on wayland
 Patch0:         mutter-fix-startup.patch
 # PATCH-FEATURE-UPSTREAM mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch FATE#323412 bgo#781704 bsc#1024748 vliaskovitis@suse.com -- iconcache: Support RGB16_565 format for 16-bit sessions
@@ -44,6 +45,7 @@ Patch1002:      mutter-SLE-bsc984738-grab-display.patch
 BuildRequires:  Mesa-libGLESv3-devel
 BuildRequires:  fdupes
 BuildRequires:  intltool
+BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  translation-update-upstream
 BuildRequires:  zenity
@@ -106,8 +108,8 @@ Requires:       %{name}-data >= %{version}
 # We need to obsolete the old mutter libs, as otherwise upgrading is impossible
 # This makes me believe we should probably fold libmutter into the main package
 # with the next update (3.30)
-Obsoletes:      libmutter0
 Obsoletes:      libmutter-1-0
+Obsoletes:      libmutter0
 
 %description -n libmutter-%{mutter_major}-%{mutter_minor}
 Mutter is a window and compositing manager based on Clutter, forked
@@ -154,6 +156,7 @@ translation-update-upstream
 
 %build
 # FIXME add --enable-remote-desktop when libpipewire-0.1 is available
+NOCONFIGURE=1 ./autogen.sh
 %configure \
 	--enable-wayland \
 	--enable-native-backend \