diff --git a/common/shlibs b/common/shlibs
index 91f1c439dfa..bd16df7187d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -828,7 +828,7 @@ libunique-1.0.so.0		libunique1		libunique1-devel
 libxnoise.so.0			libxnoise		xnoise-devel
 libdiscid.so.0			libdiscid		libdiscid-devel
 libmusicbrainz3.so.6		libmusicbrainz		libmusicbrainz-devel
-librhythmbox-core.so.4		librhythmbox		rhythmbox-devel
+librhythmbox-core.so.5		librhythmbox		rhythmbox-devel
 libdmapsharing-3.0.so.2		libdmapsharing		libdmapsharing-devel
 libgexiv2.so.0			libgexiv2		libgexiv2-devel
 libraw.so.5			libraw			libraw-devel
diff --git a/srcpkgs/rhythmbox/depends b/srcpkgs/rhythmbox/depends
index 73db7b8d996..d83ae7e5286 100644
--- a/srcpkgs/rhythmbox/depends
+++ b/srcpkgs/rhythmbox/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.90.1"
+abi_depends=">=2.95"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/rhythmbox/librhythmbox.rshlibs b/srcpkgs/rhythmbox/librhythmbox.rshlibs
index 59be63ffd9c..84b12552450 100644
--- a/srcpkgs/rhythmbox/librhythmbox.rshlibs
+++ b/srcpkgs/rhythmbox/librhythmbox.rshlibs
@@ -38,3 +38,4 @@ libgsttag-0.10.so.0
 libz.so.1
 libpthread.so.0
 libc.so.6
+libtdb.so.1
diff --git a/srcpkgs/rhythmbox/librhythmbox.template b/srcpkgs/rhythmbox/librhythmbox.template
index 62d08b0c06a..986de9b1e11 100644
--- a/srcpkgs/rhythmbox/librhythmbox.template
+++ b/srcpkgs/rhythmbox/librhythmbox.template
@@ -6,7 +6,6 @@ long_desc="
 
  This package includes the shared library."
 
-do_install()
-{
+do_install() {
 	vmove "usr/lib/*.so*" usr/lib
 }
diff --git a/srcpkgs/rhythmbox/rhythmbox-devel.template b/srcpkgs/rhythmbox/rhythmbox-devel.template
index 6f061ea9cf5..1c14f0672a8 100644
--- a/srcpkgs/rhythmbox/rhythmbox-devel.template
+++ b/srcpkgs/rhythmbox/rhythmbox-devel.template
@@ -8,9 +8,9 @@ long_desc="${long_desc}
 Add_dependency run gtk+3-devel
 Add_dependency run librhythmbox
 
-do_install()
-{
+do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
 	vmove usr/share/gir-1.0 usr/share
+	vmove usr/share/gtk-doc usr/share
 }
diff --git a/srcpkgs/rhythmbox/rhythmbox.rshlibs b/srcpkgs/rhythmbox/rhythmbox.rshlibs
index 26404d156c7..0c045e7f11b 100644
--- a/srcpkgs/rhythmbox/rhythmbox.rshlibs
+++ b/srcpkgs/rhythmbox/rhythmbox.rshlibs
@@ -7,7 +7,6 @@ libgstpbutils-0.10.so.0
 libpthread.so.0
 libc.so.6
 libz.so.1
-librhythmbox-core.so.4
 libnotify.so.4
 libm.so.6
 libSM.so.6
@@ -63,3 +62,5 @@ libXdamage.so.1
 libXcomposite.so.1
 libXfixes.so.3
 libgrilo-0.1.so.0
+librhythmbox-core.so.5
+libtdb.so.1
diff --git a/srcpkgs/rhythmbox/template b/srcpkgs/rhythmbox/template
index 9977cfe73be..70c72724abd 100644
--- a/srcpkgs/rhythmbox/template
+++ b/srcpkgs/rhythmbox/template
@@ -1,8 +1,8 @@
 # Template file for 'rhythmbox'.
 pkgname=rhythmbox
-version="2.90.1.git$(date -u +%Y%m%d)"
+version=2.95
 homepage="http://www.rhythmbox.org"
-#distfiles="${GNOME_SITE}/$pkgname/0.13/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/2.95/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--with-mdns=avahi --disable-scrollkeeper --disable-static
 --disable-python --disable-schemas-install --enable-daap --with-webkit
@@ -10,7 +10,7 @@ configure_args="--with-mdns=avahi --disable-scrollkeeper --disable-static
 short_desc="GNOME integrated music management application, inspired by Apple's iTunes."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
-checksum=931d42e7fcad8e5ab76d52900fbbbe3d9de4099dc04e2b35f27e0e99121c4796
+checksum=12cab95c89514b5c01a2daf9d6bdf74c8652b35e49625e2906d51b487bc68c06
 long_desc="
  Rhythmbox is an integrated music management application, originally inspired
  by Apple's iTunes. It is free software, designed to work well under the
@@ -30,18 +30,12 @@ long_desc="
  * Automatically download audio podcasts
  * Browse, preview, and download albums from Magnatune and Jamendo"
 
-nofetch=yes
-noextract=yes
-
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="lib${pkgname} ${pkgname}-devel"
 
-Add_dependency build git
-Add_dependency build gnome-common
-Add_dependency build gtk-doc
-Add_dependency build gettext-devel
 Add_dependency build pkg-config
 Add_dependency build intltool
+Add_dependency build gnome-doc-utils
 Add_dependency build gtk+3-devel
 Add_dependency build totem-pl-parser-devel
 Add_dependency build libsoup-devel
@@ -63,16 +57,7 @@ Add_dependency build clutter-gtk-devel
 Add_dependency build clutter-gst-devel
 Add_dependency build mx-devel
 Add_dependency build libdmapsharing-devel
+Add_dependency build tdb-devel ">=1.2.6"
 
 Add_dependency full desktop-file-utils
 Add_dependency full hicolor-icon-theme
-
-do_fetch() {
-	local url="git://git.gnome.org/rhythmbox"
-	msg_normal "Fetching source from git repo at $url\n"
-	git clone ${url} ${pkgname}-${version}
-}
-
-pre_configure() {
-	./autogen.sh
-}