diff --git a/baselibs.conf b/baselibs.conf
index 6b1b939..e223b57 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1 @@
-libdav1d1
+libdav1d2
diff --git a/dav1d-0.3.1.tar.gz b/dav1d-0.3.1.tar.gz
deleted file mode 100644
index 9d14132..0000000
--- a/dav1d-0.3.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f94af23403d54e185a41bb56ee3155151c7e50821711b439dd2c4b6faf32f885
-size 573660
diff --git a/dav1d-0.4.0.tar.gz b/dav1d-0.4.0.tar.gz
new file mode 100644
index 0000000..c91b40b
--- /dev/null
+++ b/dav1d-0.4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f3a825bce590778b4959807470cd853bbcbd0d3c10d98958a3a1eea09ce64544
+size 634776
diff --git a/dav1d.armv6.patch b/dav1d.armv6.patch
deleted file mode 100644
index 8a77a70..0000000
--- a/dav1d.armv6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/tests/checkasm/checkasm.h
-+++ b/tests/checkasm/checkasm.h
-@@ -145,6 +145,7 @@ static inline uint64_t readtime(void) {
- #define readtime readtime
- #endif
- #elif ARCH_ARM && !defined(_MSC_VER)
-+#if __ARM_ARCH > 6
- static inline uint64_t readtime(void) {
-     uint32_t cycle_counter;
-     /* This requires enabling user mode access to the cycle counter (which
-@@ -156,6 +157,7 @@ static inline uint64_t readtime(void) {
- }
- #define readtime readtime
- #endif
-+#endif
- 
- /* Verifies that clobbered callee-saved registers
-  * are properly saved and restored */
diff --git a/dav1d.changes b/dav1d.changes
index 1f53a39..ce6eb4c 100644
--- a/dav1d.changes
+++ b/dav1d.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Mon Aug  5 14:55:40 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
+
+- Update to version 0.4.0
+  * Fix playback with unknown OBUs
+  * Add an option to limit the maximum frame size
+  * SSE2 and ARM64 optimizations for MSAC
+  * Improve speed on 32bits systems
+  * Optimization in obmc blend
+  * Reduce RAM usage significantly
+  * The initial PPC SIMD code, cdef_filter
+  * NEON optimizations for blend functions on ARM
+  * NEON optimizations for w_mask functions on ARM
+  * NEON optimizations for inverse transforms on ARM64
+  * Improve handling of malloc failures
+  * Simple Player example in tools
+
+- Dropped dav1d.armv6.patch (merged upstream)
+
+- Bumped SOVERSION to 2
+
 -------------------------------------------------------------------
 Mon May 13 19:48:51 UTC 2019 - olaf@aepfle.de
 
diff --git a/dav1d.spec b/dav1d.spec
index b7af468..c9c497a 100644
--- a/dav1d.spec
+++ b/dav1d.spec
@@ -16,9 +16,9 @@
 #
 
 
-%define sover   1
+%define sover   2
 Name:           dav1d
-Version:        0.3.1
+Version:        0.4.0
 Release:        0
 Summary:        An AV1 decoder
 License:        BSD-2-Clause
@@ -26,8 +26,6 @@ Group:          Productivity/Multimedia/Video/Editors and Convertors
 URL:            https://code.videolan.org/videolan/dav1d
 Source0:        https://code.videolan.org/videolan/dav1d/-/archive/%{version}/dav1d-%{version}.tar.gz
 Source99:       baselibs.conf
-# PATCH-FIX-UPSTREAM dav1d.armv6.patch olaf@aepfle.de -- disable armv7 asm for armv6 builds
-Patch0:         dav1d.armv6.patch
 BuildRequires:  meson >= 0.47.0
 BuildRequires:  nasm
 BuildRequires:  pkgconfig