diff --git a/btrfs-progs-v3.19.1.tar.gz b/btrfs-progs-v3.19.1.tar.gz
deleted file mode 100644
index 87debc2..0000000
--- a/btrfs-progs-v3.19.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:97acc9b1b410817249c52cd260faee65ed0caa662ad7975bb7f59708a8ae1d6b
-size 1333967
diff --git a/btrfs-progs-v4.0.tar.gz b/btrfs-progs-v4.0.tar.gz
new file mode 100644
index 0000000..56648f3
--- /dev/null
+++ b/btrfs-progs-v4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:acb4cfa42f9c34dc6c4f701f8c56e57099baa1b44646df1bb5a292d8e571c465
+size 1336434
diff --git a/btrfsprogs.changes b/btrfsprogs.changes
index ed72da5..0adada1 100644
--- a/btrfsprogs.changes
+++ b/btrfsprogs.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Wed Apr 29 00:00:00 CEST 2015 - dsterba@suse.cz
+
+- version 4.0
+  * resize:
+    * don't accept file as an argument (it's confusing)
+    * print better error message in case of an error
+  * restore: optionally restore metadata (time, mode, uid/gid)
+  * receive: optionally enforce chroot
+  * new rescue subcommand 'zero-log', same as btrfs-zero-log, but
+    now also part of the main utility
+  * check:
+    * free space checks match kernel, fixes incorrect reports
+  * convert: fix setting of checksum bit if --no-datasum is used
+  * fsck.btrfs: don't print messages
+  * fix quota rescan on PPC64 (mangled ioctl number)
+  * test updates
+  * documentation: files renamed to .asciidoc, misc fixups
+
 -------------------------------------------------------------------
 Wed Mar 25 00:00:00 CET 2015 - dsterba@suse.cz
 
diff --git a/btrfsprogs.spec b/btrfsprogs.spec
index 42dc7f5..2d758be 100644
--- a/btrfsprogs.spec
+++ b/btrfsprogs.spec
@@ -17,7 +17,7 @@
 
 
 Name:           btrfsprogs
-Version:        3.19.1
+Version:        4.0
 Release:        0
 Summary:        Utilities for the Btrfs filesystem
 License:        GPL-2.0
diff --git a/fix-doc-build-on-SLE11SP3.diff b/fix-doc-build-on-SLE11SP3.diff
index 104dafc..4063b00 100644
--- a/fix-doc-build-on-SLE11SP3.diff
+++ b/fix-doc-build-on-SLE11SP3.diff
@@ -5,8 +5,8 @@ ERROR: btrfs-mount.xml.tmp1: line 9: second section must be named SYNOPSIS
 
 Index: btrfs-progs-v3.17.1/Documentation/btrfs-mount.txt
 ===================================================================
---- btrfs-progs-v3.17.1.orig/Documentation/btrfs-mount.txt
-+++ btrfs-progs-v3.17.1/Documentation/btrfs-mount.txt
+--- btrfs-progs-v3.17.1.orig/Documentation/btrfs-mount.asciidoc
++++ btrfs-progs-v3.17.1/Documentation/btrfs-mount.asciidoc
 @@ -5,6 +5,10 @@ NAME
  ----
  btrfs-mount - mount options and supported file attributes for the btrfs filesystem
diff --git a/local-version-override.patch b/local-version-override.patch
index c05b8e2..3e3d6e2 100644
--- a/local-version-override.patch
+++ b/local-version-override.patch
@@ -6,8 +6,8 @@ Index: btrfs-progs-v3.19/version.sh
  # Copyright 2008, Oracle
  # Released under the GNU GPLv2
   
--v="v3.19.1"
-+v="v3.19.1+20150325"
+-v="v4.0"
++v="v4.0+20150429"
  
  opt=$1