diff --git a/btrfs-progs-v4.2.1.tar.gz b/btrfs-progs-v4.2.1.tar.gz
deleted file mode 100644
index c075cba..0000000
--- a/btrfs-progs-v4.2.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c89d014c45f0d90da3808c882d97ecdb2e2f1ef1ad7e4b3e9d820620d19b197f
-size 1384768
diff --git a/btrfs-progs-v4.2.3.tar.gz b/btrfs-progs-v4.2.3.tar.gz
new file mode 100644
index 0000000..d8d2059
--- /dev/null
+++ b/btrfs-progs-v4.2.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fcf9bc995cb928717867a7892f1184276bf40ee3d2d7e712e75ef9b95c5bf853
+size 1384841
diff --git a/btrfsprogs.changes b/btrfsprogs.changes
index c5a38d3..d42b2ce 100644
--- a/btrfsprogs.changes
+++ b/btrfsprogs.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Mon Oct 19 00:00:00 CEST 2015 - dsterba@suse.cz
+
+- update to 4.2.3
+  - subvol sync: make it actually work again
+  - scanning: do not scan already discovered filesystems (minor optimization)
+  - convert: better error message in case the filesystem is not finalized
+  - restore: off-by-one symlink path check fix
+
+-------------------------------------------------------------------
+Mon Oct  5 00:00:00 CEST 2015 - dsterba@suse.cz
+
+- update to 4.2.2
+  - fi label: use fallback if the label ioctl is not available
+  - convert: check nodesize constraints against commandline features (-O)
+  - scrub: report status 'running' until all devices are finished
+  - device scanning might crash in some scenarios
+  - fi usage: print summary for non-root users
+
 -------------------------------------------------------------------
 Tue Sep 22 00:00:00 CEST 2015 - dsterba@suse.cz
 
diff --git a/btrfsprogs.spec b/btrfsprogs.spec
index 17cf9ed..85e7f1c 100644
--- a/btrfsprogs.spec
+++ b/btrfsprogs.spec
@@ -17,7 +17,7 @@
 
 
 Name:           btrfsprogs
-Version:        4.2.1
+Version:        4.2.3
 Release:        0
 Summary:        Utilities for the Btrfs filesystem
 License:        GPL-2.0
diff --git a/local-version-override.patch b/local-version-override.patch
index 0ffe441..4185cda 100644
--- a/local-version-override.patch
+++ b/local-version-override.patch
@@ -6,8 +6,8 @@ Index: btrfs-progs-v4.1/version.sh
  # Copyright 2008, Oracle
  # Released under the GNU GPLv2
  
--v="v4.2.1"
-+v="v4.2+20150922"
+-v="v4.2.3"
++v="v4.2.3+20151019"
  
  opt=$1