diff --git a/_service b/_service
new file mode 100644
index 0000000..b58efd8
--- /dev/null
+++ b/_service
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<services>
+  <service name="obs_scm" mode="manual">
+    <param name="scm">git</param>
+    <param name="url">https://gitlab.gnome.org/GNOME/gnome-kiosk.git</param>
+    <param name="revision">main</param>
+    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
+    <param name="versionrewrite-pattern">(.*)\+0</param>
+    <param name="versionrewrite-replacement">\1</param>
+    <param name="changesgenerate">enable</param>
+  </service>
+  <service name="tar" mode="buildtime"/>
+  <service name="recompress" mode="buildtime">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+  <service name="set_version" mode="manual" />
+</services>
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..5e9f001
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">https://gitlab.gnome.org/GNOME/gnome-kiosk.git</param>
+              <param name="changesrevision">3c33b4e6e3ad753733687949c503d18aa4fb185a</param></service></servicedata>
\ No newline at end of file
diff --git a/gnome-kiosk-42.0+12.obscpio b/gnome-kiosk-42.0+12.obscpio
new file mode 100644
index 0000000..984838d
--- /dev/null
+++ b/gnome-kiosk-42.0+12.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:76a398b84b83657402cda4e843e9b0b33dfd3e290725f6d5a0f40745028816eb
+size 298507
diff --git a/gnome-kiosk-42.0.tar.xz b/gnome-kiosk-42.0.tar.xz
deleted file mode 100644
index a0a2215..0000000
--- a/gnome-kiosk-42.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2ae99484c71ebaa792d766d4d37981bfcade7c98fe0a480b85676609c6ad9cf8
-size 41060
diff --git a/gnome-kiosk-fix-meson-061.patch b/gnome-kiosk-fix-meson-061.patch
deleted file mode 100644
index c839d1f..0000000
--- a/gnome-kiosk-fix-meson-061.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur orig-gnome-kiosk-42.alpha/meson.build gnome-kiosk-42.alpha/meson.build
---- orig-gnome-kiosk-42.alpha/meson.build	2022-02-02 22:19:47.297891292 +0100
-+++ gnome-kiosk-42.alpha/meson.build	2022-02-02 22:20:52.338499586 +0100
-@@ -142,7 +142,7 @@
-         configuration: desktop_config_data
- )
- 
--i18n.merge_file('desktop',
-+i18n.merge_file(
-         input: desktop_file,
-         output: 'org.gnome.Kiosk.desktop',
-         po_dir: po_dir,
-
diff --git a/gnome-kiosk.changes b/gnome-kiosk.changes
index 04f83c2..2b0fc46 100644
--- a/gnome-kiosk.changes
+++ b/gnome-kiosk.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Sat Sep 10 13:37:57 UTC 2022 - bjorn.lie@gmail.com
+
+- Update to version 42.0+12:
+  * compositor:
+    - Delete g_autoptr blank lines
+    - Run entire codebase through uncrustify
+  * scripts:
+    - Don't force newline after variable declarations
+    - Add uncrustify config
+  * ci: Enforce coding style in CI
+  * Bump mutter library requirements to 11 (mutter 43)
+  * Drop unused positional argument to i18n.merge_file
+- Switch to git checkout via source service, following this, bump
+  mutter_api to 11 following upstream changes.
+- Drop gnome-kiosk-fix-meson-061.patch: Fixed upstream.
+
 -------------------------------------------------------------------
 Tue Mar 22 08:10:07 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/gnome-kiosk.obsinfo b/gnome-kiosk.obsinfo
new file mode 100644
index 0000000..63262c7
--- /dev/null
+++ b/gnome-kiosk.obsinfo
@@ -0,0 +1,4 @@
+name: gnome-kiosk
+version: 42.0+12
+mtime: 1659117819
+commit: 364e7e108fa3e0a4adc2d25c1d432ccb8872732a
diff --git a/gnome-kiosk.spec b/gnome-kiosk.spec
index 0fcb2e5..be9f2e0 100644
--- a/gnome-kiosk.spec
+++ b/gnome-kiosk.spec
@@ -16,17 +16,15 @@
 #
 
 
-%define mutter_api 10
+%define mutter_api 11
 
 Name:           gnome-kiosk
-Version:        42.0
+Version:        42.0+12
 Release:        0
 Summary:        Mutter based compositor for kiosks
 License:        GPL-2.0-or-later
 URL:            https://gitlab.gnome.org/GNOME/gnome-kiosk
-Source0:        https://download.gnome.org/sources/gnome-kiosk/42/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM gnome-kiosk-fix-meson-061.patch bjorn.lie@gmail.com -- Fix build with meson 0.61 and newer
-Patch0:         gnome-kiosk-fix-meson-061.patch
+Source0:        %{name}-%{version}.tar.xz
 
 BuildRequires:  fdupes
 BuildRequires:  meson