diff --git a/baselibs.conf b/baselibs.conf
index dbc89e0..604ea43 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,3 +1,3 @@
-libprotobuf7
-libprotobuf-lite7
-libprotoc7
+libprotobuf8
+libprotobuf-lite8
+libprotoc8
diff --git a/gtest-1.5.0.tar.bz2 b/gtest-1.5.0.tar.bz2
deleted file mode 100644
index 92ccd81..0000000
--- a/gtest-1.5.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5a7350a56d9536d83e41931d4300ca934f71cf09700542191b6267f4a466f20b
-size 592328
diff --git a/protobuf-2.4.1.tar.bz2 b/protobuf-2.4.1.tar.bz2
deleted file mode 100644
index daab98c..0000000
--- a/protobuf-2.4.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf
-size 1440188
diff --git a/protobuf-2.5.0.tar.bz2 b/protobuf-2.5.0.tar.bz2
new file mode 100644
index 0000000..e3e7846
--- /dev/null
+++ b/protobuf-2.5.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677
+size 1866763
diff --git a/protobuf.changes b/protobuf.changes
index f8d63fb..362d0c1 100644
--- a/protobuf.changes
+++ b/protobuf.changes
@@ -1,4 +1,24 @@
 -------------------------------------------------------------------
+Fri Apr 12 18:35:09 UTC 2013 - ftake@geeko.jp
+
+- Upstream update to 2.5.0
+  * New construct "import public"
+  * New enum option "allow_alias"
+  * C++: New generated method set_allocated_foo(Type* foo)
+  * C++: Added SetAllocatedExtension() and ReleaseExtension()
+    to extensions API
+  * Java: Added getters/setters to access the underlying ByteString
+    of a string field
+  * Java: New operations for substring(), prepend(), and append()
+  * Java: New method findInitializationErrors()
+  * Python: Support for dynamic message creation
+  * Python: Fixed custom options were not correctly populated
+  * Python: Added EnumTypeWrapper
+  * Python: Added ParseMessage(descriptor, bytes)
+  * Various bug fixes and optimazations
+- Drop gtest-1.5, which is now included by the archive from
+  the upstream
+-------------------------------------------------------------------
 Sat May 19 18:25:52 UTC 2012 - crrodriguez@opensuse.org
 
 - BuildRequire zlib-devel otherwise gzip_stream is not built 
diff --git a/protobuf.spec b/protobuf.spec
index f04152b..94cad68 100644
--- a/protobuf.spec
+++ b/protobuf.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package protobuf
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
 #
 
 
-%define soname 7
+%define soname 8
 
 %bcond_without check
 
@@ -36,14 +36,12 @@ Name:           protobuf
 Summary:        Protocol Buffers - Google's data interchange format
 License:        BSD-3-Clause
 Group:          Development/Libraries/C and C++
-Version:        2.4.1
+Version:        2.5.0
 Release:        0
 # Reminder: Remove gtest 1.5.0 injected tarball.
 Url:            http://code.google.com/p/protobuf/ 
 Source0:        http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2
 Source1:        manifest.txt.in
-# gtest 1.5.0 is just there to fuix the build with gcc 4.7... newer version of protobuf includes this.
-Source2:        gtest-1.5.0.tar.bz2
 Patch0:         protobuf-setuptools-2.4.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Needed to rebootstrap with gtest 1.5.0
@@ -138,21 +136,13 @@ This package contains the Python bindings for Google Protocol Buffers.
 
 %setup -q
 %patch0 -p0
-%if "%{version}" == "2.4.1"
-rm -rf gtest
-tar xf %{S:2}
-%else
-echo "Drop this gtest injection hack... any newer version than protobuf 2.4.1 should have gtest 1.5.0 included."
-false
-%endif
 
 %build
 %if 0%{?mandriva_version}
 #XXX something wents wrong with detecting this
 export PTHREAD_LIBS=-lpthread
 %endif
-# Needed due to gtest 1.5.0 injection
-autoreconf -fiv
+#
 %configure --disable-static
 %{__make} %{?jobs:-j%jobs}
 #