diff --git a/srcpkgs/xnoise/libxnoise.rshlibs b/srcpkgs/xnoise/libxnoise.rshlibs
index 7f09a076d97..0ffe31ad6ad 100644
--- a/srcpkgs/xnoise/libxnoise.rshlibs
+++ b/srcpkgs/xnoise/libxnoise.rshlibs
@@ -6,12 +6,9 @@ libtag_c.so.0
 libtag.so.1
 libatk-1.0.so.0
 libgio-2.0.so.0
-libpangoft2-1.0.so.0
 libpangocairo-1.0.so.0
 libgdk_pixbuf-2.0.so.0
 libpango-1.0.so.0
-libfreetype.so.6
-libfontconfig.so.1
 libgobject-2.0.so.0
 libgmodule-2.0.so.0
 libgthread-2.0.so.0
diff --git a/srcpkgs/xnoise/template b/srcpkgs/xnoise/template
index 8fdf9fd1508..8fa14ab7904 100644
--- a/srcpkgs/xnoise/template
+++ b/srcpkgs/xnoise/template
@@ -1,24 +1,21 @@
 # Template file for 'xnoise'.
 pkgname=xnoise
-version=0.1.31
-homepage="http://http://code.google.com/p/xnoise/"
-distfiles="http://xnoise.googlecode.com/files/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
-makedepends="pkg-config intltool gtk+3-devel taglib-devel sqlite-devel libnotify-devel libsoup-devel gst-plugins-base-devel"
-fulldepends="desktop-file-utils hicolor-icon-theme"
+version=0.2.2
 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"
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+subpackages="libxnoise xnoise-devel"
 short_desc="Media player for GTK+ with a slick GUI"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
-checksum=a532e691ff51735b50b0b5438d108c8d240175cbb9ee0b5d32fbdd6f04b5cb33
+homepage="http://www.xnoise-media-player.com/"
+distfiles="https://github.com/downloads/shuerhaaken/xnoise/xnoise-$version.tar.gz"
+checksum=c15fa213c2457b098eccb2bb2df88074f56c5607fa607e50a0088c04a844d1bc
 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
  without being removed (right side of window). This gives you the possibility
  to queue any track in any order, regardless if they are on the same album.
  Tracks or groups of tracks can be reordered at any time via drag and drop."
-
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="libxnoise xnoise-devel"
-
-
diff --git a/srcpkgs/xnoise/xnoise-devel.template b/srcpkgs/xnoise/xnoise-devel.template
index b084a85962b..c369ee30e9f 100644
--- a/srcpkgs/xnoise/xnoise-devel.template
+++ b/srcpkgs/xnoise/xnoise-devel.template
@@ -1,14 +1,13 @@
 # Template file for 'xnoise-devel'.
 #
-depends="libxnoise"
+noarch=yes
+depends="libxnoise>=$version"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-do_install()
-{
+do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
 	vmove usr/share/vala usr/share
diff --git a/srcpkgs/xnoise/xnoise.rshlibs b/srcpkgs/xnoise/xnoise.rshlibs
index 61e83a8fdae..7b355bdb9fe 100644
--- a/srcpkgs/xnoise/xnoise.rshlibs
+++ b/srcpkgs/xnoise/xnoise.rshlibs
@@ -6,12 +6,9 @@ libtag_c.so.0
 libtag.so.1
 libatk-1.0.so.0
 libgio-2.0.so.0
-libpangoft2-1.0.so.0
 libpangocairo-1.0.so.0
 libgdk_pixbuf-2.0.so.0
 libpango-1.0.so.0
-libfreetype.so.6
-libfontconfig.so.1
 libgobject-2.0.so.0
 libgmodule-2.0.so.0
 libgthread-2.0.so.0