diff --git a/srcpkgs/xnoise/libxnoise.template b/srcpkgs/xnoise/libxnoise.template
index 6164d803264..2b26b7a3e4a 100644
--- a/srcpkgs/xnoise/libxnoise.template
+++ b/srcpkgs/xnoise/libxnoise.template
@@ -1,11 +1,7 @@
 # Template file for 'libxnoise'.
 #
 short_desc="${short_desc} - shared library"
-long_desc="
- ${long_desc}
-
- This package includes the shared library."
 
 do_install() {
-	vmove "usr/lib/xnoise/libxnoise.so*" usr/lib
+	vmove "usr/lib/libxnoise.so*" usr/lib
 }
diff --git a/srcpkgs/xnoise/template b/srcpkgs/xnoise/template
index c2c7522dc3d..a181a8bf7d6 100644
--- a/srcpkgs/xnoise/template
+++ b/srcpkgs/xnoise/template
@@ -1,18 +1,18 @@
 # Template file for 'xnoise'.
 pkgname=xnoise
-version=0.2.9
+version=0.2.17
 revision=1
 build_style=gnu-configure
-depends="desktop-file-utils hicolor-icon-theme"
-makedepends="pkg-config intltool gtk+3-devel taglib-devel sqlite-devel libnotify-devel libsoup-devel gst-plugins-base-devel"
-
 subpackages="libxnoise xnoise-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+makedepends="pkg-config intltool gtk+3-devel libtaginfo-devel sqlite-devel
+ libnotify-devel libsoup-devel gst-plugins-base1-devel"
 short_desc="Media player for GTK+ with a slick GUI"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://www.xnoise-media-player.com/"
-distfiles="https://github.com/downloads/shuerhaaken/xnoise/xnoise-$version.tar.gz"
-checksum=66732d24a9335c4ef2dbd056071e362318e6d773ab4405cda8bf6dc3e0016bd5
+distfiles="https://bitbucket.org/shuerhaaken/xnoise/downloads/xnoise-${version}.tar.gz"
+checksum=0d3503ddce618a4716626c4b8b7c5abdeb4730227281fe93d4eba2584b43e180
 long_desc="
  Unlike Rhythmbox, Banshee or itunes, Xnoise uses a tracklist centric design.
  The tracklist is a list of video or music tracks that are played one by one
diff --git a/srcpkgs/xnoise/xnoise-devel.template b/srcpkgs/xnoise/xnoise-devel.template
index c369ee30e9f..8b12e8c6848 100644
--- a/srcpkgs/xnoise/xnoise-devel.template
+++ b/srcpkgs/xnoise/xnoise-devel.template
@@ -2,10 +2,7 @@
 #
 noarch=yes
 depends="libxnoise>=$version"
-short_desc="${sourcepkg} development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
+short_desc="${short_desc} - development files"
 
 do_install() {
 	vmove usr/include usr