diff --git a/_service b/_service
index 6a5614b..fcaef80 100644
--- a/_service
+++ b/_service
@@ -4,7 +4,7 @@
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>
     <param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@</param>
-    <param name="versionrewrite-pattern">v(.*)</param>
+    <param name="versionrewrite-pattern">v(.*?)(\+git0)?$</param>
   </service>
   <service mode="disabled" name="set_version" />
   <service mode="buildtime" name="tar" />
diff --git a/_servicedata b/_servicedata
index 4f92cb5..2e65943 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/combustion.git</param>
-              <param name="changesrevision">a7be9f0f6e3d85fb44f36f809a734cae0e455fca</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">09b719e283fe6505de11a5745cafec6681bb0c5a</param></service></servicedata>
\ No newline at end of file
diff --git a/combustion-1.1+git0.obscpio b/combustion-1.1+git0.obscpio
deleted file mode 100644
index edd9533..0000000
--- a/combustion-1.1+git0.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d01fc871ac0961b7f5d21d326292b35576f2efc2374aa72a1f2cfb119a6eb51
-size 38410
diff --git a/combustion-1.2+git2.obscpio b/combustion-1.2+git2.obscpio
new file mode 100644
index 0000000..da3e8fc
--- /dev/null
+++ b/combustion-1.2+git2.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a866a39a1d8a58c1ccb896d1f2c59cb284652eeeef330274388b1c32c428c503
+size 43530
diff --git a/combustion.changes b/combustion.changes
index b713783..39edd05 100644
--- a/combustion.changes
+++ b/combustion.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Tue Aug 22 15:57:49 UTC 2023 - Fabian Vogt <fvogt@suse.com>
+
+- Update to version 1.2+git2:
+  * Don't consider /var/lib/YaST2/reconfig_system for firstboot detection
+  * Use improved x-initrd.mount code in firstboot-detect as well
+
+-------------------------------------------------------------------
+Mon Aug 21 06:35:50 UTC 2023 - Fabian Vogt <fvogt@suse.com>
+
+- Update to version 1.2:
+  * Don't remove YaST reconfig_system marker if called from ignition
+  * Remove now obsolete workaround for ignition-mount.service ExecStop
+  * Set dasd_mod.dasd=autodetect in modprobe.d
+  * Omit combustion module in initrds for already configured systems
+  * New module to handle firstboot detection in the initrd (poo#127196,
+    jsc#PED-5843)
+  * Fixes for use with ignition-kargs-helper
+  * Improve x-initrd.mount handling
+  * Work around systemd issue with emergency.target at the root
+
 -------------------------------------------------------------------
 Thu Aug 03 07:32:20 UTC 2023 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/combustion.obsinfo b/combustion.obsinfo
index bd9a441..9449b89 100644
--- a/combustion.obsinfo
+++ b/combustion.obsinfo
@@ -1,4 +1,4 @@
 name: combustion
-version: 1.1+git0
-mtime: 1691047068
-commit: a7be9f0f6e3d85fb44f36f809a734cae0e455fca
+version: 1.2+git2
+mtime: 1692719799
+commit: 09b719e283fe6505de11a5745cafec6681bb0c5a
diff --git a/combustion.spec b/combustion.spec
index f94b505..54f2e60 100644
--- a/combustion.spec
+++ b/combustion.spec
@@ -17,14 +17,15 @@
 
 
 Name:           combustion
-Version:        1.1+git0
+Version:        1.2+git2
 Release:        0
 Summary:        System for initial configuration of appliances
 License:        GPL-2.0-or-later
 Group:          System/Management
 URL:            https://github.com/openSUSE/combustion
 Source0:        %{name}-%{version}.tar.xz
-Requires:       ignition-dracut-grub2
+# This doesn't work with old ignition,conflict with the old firstboot mechanism.
+Conflicts:      ignition-dracut-grub2
 BuildArch:      noarch
 
 %description
@@ -56,6 +57,9 @@ snapshot, so that no reboot is needed.
 %doc README.md
 %dir %{_prefix}/lib/dracut/
 %dir %{_prefix}/lib/dracut/modules.d/
+# Also used by ignition. Could be split into a separate package,
+# but ignition depends on combustion anyway.
+%{_prefix}/lib/dracut/modules.d/30firstboot/
 %{_prefix}/lib/dracut/modules.d/35combustion/
 
 %changelog