diff --git a/0002-allow-multiple-mounts-of-same-device.patch b/0002-allow-multiple-mounts-of-same-device.patch
index 7a7e54a..b6232d3 100644
--- a/0002-allow-multiple-mounts-of-same-device.patch
+++ b/0002-allow-multiple-mounts-of-same-device.patch
@@ -6,10 +6,23 @@ Upstream: Ticket opened [gh#coreos/ignition#890]
     e.g. to mount several subvolumes from a Btrfs device or bind mounting
     the device to multiple places, by also adding the path to the key.
 
-diff --git a/config/v3_1_experimental/types/filesystem.go b/config/v3_1_experimental/types/filesystem.go
-index 964dfca..bd301f8 100644
---- a/config/v3_1_experimental/types/filesystem.go
-+++ b/config/v3_1_experimental/types/filesystem.go
+Index: ignition-2.3.0/config/v3_1/types/filesystem.go
+===================================================================
+--- ignition-2.3.0.orig/config/v3_1/types/filesystem.go
++++ ignition-2.3.0/config/v3_1/types/filesystem.go
+@@ -23,7 +23,7 @@ import (
+ )
+ 
+ func (f Filesystem) Key() string {
+-	return f.Device
++	return f.Device + *f.Path
+ }
+ 
+ func (f Filesystem) IgnoreDuplicates() map[string]struct{} {
+Index: ignition-2.3.0/config/v3_2_experimental/types/filesystem.go
+===================================================================
+--- ignition-2.3.0.orig/config/v3_2_experimental/types/filesystem.go
++++ ignition-2.3.0/config/v3_2_experimental/types/filesystem.go
 @@ -23,7 +23,7 @@ import (
  )
  
diff --git a/_service b/_service
index f6def2a..fe9cd46 100644
--- a/_service
+++ b/_service
@@ -1,7 +1,7 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="version">2.2.1</param>
-    <param name="revision">v2.2.1</param>
+    <param name="version">2.3.0</param>
+    <param name="revision">v2.3.0</param>
     <param name="url">git://github.com/coreos/ignition.git</param>
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>
diff --git a/_servicedata b/_servicedata
index 51e738e..d9e2089 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,6 @@
 <servicedata>
   <service name="tar_scm">
     <param name="url">git://github.com/coreos/ignition.git</param>
-    <param name="changesrevision">2d3ff5862dc9c1dd0cc78e797f42a19964ac1f4c</param>
+    <param name="changesrevision">ee616d5fb3d21babe288877e842ea137f3e68d0d</param>
  </service>
 </servicedata>
\ No newline at end of file
diff --git a/ignition-2.2.1.tar.xz b/ignition-2.2.1.tar.xz
deleted file mode 100644
index 784cb17..0000000
--- a/ignition-2.2.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5809b70df835557da86e2ec71b4c6503cfae61281c376cf10480d49f49937f08
-size 821780
diff --git a/ignition-2.3.0.tar.xz b/ignition-2.3.0.tar.xz
new file mode 100644
index 0000000..1b536a5
--- /dev/null
+++ b/ignition-2.3.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd093285c8c2b55ea653941a342bca907756c71c2e1f6a7ff802a503d03bac04
+size 811760
diff --git a/ignition.changes b/ignition.changes
index e1d519d..42f940b 100644
--- a/ignition.changes
+++ b/ignition.changes
@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Mon May 11 07:09:28 UTC 2020 - kukuk@suse.de
+
+- Update to version 2.3.0:
+  * news: add notes for 2.3.0
+  * config/v3_2_experimental: update all copyright dates
+  * doc/configuration-*: update for new spec
+  * tests: stabilize spec 3.1.0
+  * *: update for new experimental spec
+  * config/v3_2_experimental: set up package
+  * config/v3_2_experimental: copy from config/v3_1
+  * config/v3_1_experimental: mark stable
+  * doc/development: update spec stabilization instructions
+  * config: rename function for clarity
+  * tests: bump invalid 2.x experimental version to match spec2x branch
+  * config/v3_1_experimental: add some missing version tests
+  * config/v3_1/translate: fix package name
+  * doc/migrating-configs: update for 3.1.0
+  * resource/url: allow compression in data URLs
+  * doc/migrating-configs: mention spec 2.4.0
+  * validate: accept any supported config version
+  * exec: drop validate.go
+  * doc/migrating-configs: put newest version first
+  * Add SHA-256 reference in the docs
+  * Add SHA-256 support for file verification
+  * ci: run blackbox tests in CoreOS CI
+  * Send ssh_authorized keys info into the journald log
+  * Update go-systemd with the systemd module
+  * Send a message to the systemd journal if a user config is provided
+  * tests: add positive tests for resource compression
+  * spec: unify resource fetching type
+  * doc: clarify wording of files.*.verification.hash
+  * vendor: refresh after gomod changes
+  * gomod: update to go-systemd v22
+  * stages: fix package names
+  * providers/packet: override Accept header fetching instance metadata
+  * resource/url: allow caller-specified headers to override defaults
+  * Allow to specify HTTP headers for fetching configs and files
+
 -------------------------------------------------------------------
 Wed Mar 25 10:11:53 UTC 2020 - kukuk@suse.de
 
diff --git a/ignition.spec b/ignition.spec
index c79bf47..e182437 100644
--- a/ignition.spec
+++ b/ignition.spec
@@ -17,7 +17,7 @@
 
 
 Name:           ignition
-Version:        2.2.1
+Version:        2.3.0
 Release:        0
 Summary:        First boot installer and configuration tool
 License:        Apache-2.0