diff --git a/.gitignore b/.gitignore
index ed81667..e2395d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 libvtemm-0.23.1.tar.bz2
+/libvtemm-0.25.0.tar.bz2
diff --git a/libvtemm.spec b/libvtemm.spec
index 0cce629..d6ecfc3 100644
--- a/libvtemm.spec
+++ b/libvtemm.spec
@@ -1,8 +1,9 @@
 %global api 1.2
+%define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
 
 Name:           libvtemm
-Version:        0.23.1
-Release:        3%{?dist}
+Version:        0.25.0
+Release:        1%{?dist}
 
 Summary:        C++ interface for VTE (a GTK2 terminal emulator widget)
 
@@ -10,13 +11,13 @@ Group:          System Environment/Libraries
 # library is LGPLv3+, examples are GPLv3+.
 License:        LGPLv3+ and GPLv3+
 URL:            http://gtkmm.org
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.23/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{release_version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glibmm24-devel >= 2.22.0
 BuildRequires:  pangomm-devel >= 2.24.0
 BuildRequires:  gtkmm24-devel >= 2.19.2
-BuildRequires:  vte-devel >= 0.23.5
+BuildRequires:  vte-devel >= 0.26.0
 
 %description
 libvtemm provides a C++ interface to the VTE library.
@@ -36,6 +37,7 @@ developing libvtemm applications.
 %package        docs
 Summary:        Documentation for %{name}, includes full API docs
 Group:          Documentation
+Requires:       gtkmm24-docs
 
 %description    docs
 This package contains the full API documentation for %{name}.
@@ -45,6 +47,9 @@ This package contains the full API documentation for %{name}.
 
 %build
 %configure
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags} V=1
 
 %install
@@ -52,12 +57,6 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
-# move devhelp file to gtk-doc directory - it will avoid devhelp dependency by
-# putting it in directory not owned by devhelp, but by gtk-doc, on which
-# gtkmm/glibmm/othermm-docs implicitely depends anyway
-mkdir -p %{buildroot}%{_datadir}/gtk-doc/html/%{name}-%{api}
-mv %{buildroot}%{_datadir}/devhelp/books/%{name}-%{api}/%{name}-%{api}.devhelp2 %{buildroot}%{_datadir}/gtk-doc/html/%{name}-%{api}
-
 %clean
 rm -rf %{buildroot}
 
@@ -82,13 +81,15 @@ rm -rf %{buildroot}
 
 %files docs
 %defattr(-, root, root, -)
-%{_datadir}/gtk-doc/
-# API docs.
-%doc %{_datadir}/gtk-doc/html/%{name}-%{api}
-# .devhelp2 file.
 %doc %{_docdir}/%{name}-%{api}
+%doc %{_datadir}/devhelp/
 
 %changelog
+* Sat Jun 25 2011 Krzesimir Nowak <qdlacz@gmail.com> - 0.25.0-1
+- New upstream release.
+- Fixes building documentation with glibmm-2.28.
+- Documentation location fixes.
+
 * Thu Jun 02 2011 Krzesimir Nowak <qdlacz@gmail.com> - 0.23.1-3
 - Co-own /usr/share/gtk-doc directory (#604397)
 
diff --git a/sources b/sources
index aee6418..cf23eba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10ba6f94b51d354e3e2ec022ec57efe9  libvtemm-0.23.1.tar.bz2
+7c285812e0ee76acdd9b7f9704750452  libvtemm-0.25.0.tar.bz2