diff --git a/libosmocore.changes b/libosmocore.changes
index 9f561e2..486c6f4 100644
--- a/libosmocore.changes
+++ b/libosmocore.changes
@@ -3,8 +3,11 @@ Sun Mar  1 01:10:34 UTC 2015 - jengelh@inai.de
 
 - Update to new upstream release 0.8.0
 * new Osmocom SIM card library
-- Add osmo-pkgconfig.diff. Reworked osmo-talloc2.diff after
-  upstream reponse.
+- Remove 0001-utils-resolve-compiler-warnings-on-implicit-declarat.patch,
+  libosmocore_0_7_0_avoid_smscb_test_failure.patch,
+  osmo-kasumi.diff (no longer needed x3), rework osmo-talloc2.diff
+  and add osmo-talloc3.diff after upstream conversion. Add
+  osmo-pkgconfig.diff.
 
 -------------------------------------------------------------------
 Wed Feb 18 16:07:32 UTC 2015 - normand@linux.vnet.ibm.com
diff --git a/libosmocore.spec b/libosmocore.spec
index fc07cee..1817e0c 100644
--- a/libosmocore.spec
+++ b/libosmocore.spec
@@ -27,11 +27,10 @@ Url:            http://bb.osmocom.org/trac/wiki/libosmocore
 #Git-Clone:	git://git.osmocom.org/libosmocore
 #Update osmo-version.diff too!
 Source:         %name-%version.tar.xz
-Patch1:         osmo-version.diff
-Patch3:         osmo-talloc.diff
-Patch4:         osmo-talloc2.diff
-Patch5:         osmo-talloc3.diff
-Patch6:         osmo-pkgconfig.diff
+Patch1:         osmo-talloc.diff
+Patch2:         osmo-talloc2.diff
+Patch3:         osmo-talloc3.diff
+Patch4:         osmo-pkgconfig.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake >= 1.6
@@ -269,9 +268,10 @@ applications that want to make use of libosmovty.
 
 %prep
 %setup -qn %name
-%patch -P 1 -P 3 -P 4 -P 5 -P 6 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -p1
 
 %build
+echo "%version" >.tarball-version
 autoreconf -fiv
 %configure --enable-shared --disable-static
 make %{?_smp_mflags}