diff --git a/sources b/sources
index 1191fa7..c02c5cd 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
-e643cd1fcad4d98a5ae4eb877ce5087b  xine-ui-0.99.5.tar.gz
 ad74c35558588f5d4234449a076b4105  Antares.tar.gz
 61cbcf4cb3f1443a17e96c0a73eeb3a8  Bambino-Black.tar.gz
 56f21a3ffddf0f0980336a5d9cdff179  Bambino-Blue.tar.gz
@@ -7,25 +6,26 @@ dacd886be4fd9c13dd96fa3b96f3e7f8  Bambino-Orange.tar.gz
 424b4dd516569c92af7d96c10daa46d3  Bambino-Pink.tar.gz
 2e6438459244104e46d89a66e5a1f961  Bambino-Purple.tar.gz
 3e8bc6f6958e8d732b88f2e227f3c879  Bambino-White.tar.gz
+454bdc7321fc18f0db811db722c2e93c  blackslim2.tar.gz
 070fd8e3582b6f9e302b595c81dd87e4  Bluton.tar.gz
+1ff0ea8d7c73c4f3b32c13a408af3be1  caramel.tar.gz
 159b45f013183aea3038f9133f61cf89  CelomaChrome.tar.gz
 5ac74cb407b59b3487031a0564698e1f  CelomaGold.tar.gz
 dadb7b21b8e7e0c40ad7237c4f98906f  CelomaMdk.tar.gz
 06f2b0f6ceb9456bc26fae65f4f89a53  Centori.tar.gz
-eb511cd1217bc0c0bd3fa016698adebc  Crystal.tar.gz
-c7825e925434374a074c4acc46bcdd4f  Galaxy.tar.gz
-0154a3eecbeb995865ead852fd5f6bb2  Keramic.tar.gz
-bff16e879b75bd5a442c0c5c7dc22bcb  KeramicRH8.tar.gz
-54b3e28494e1d89e041ceace7db32049  OMS_legacy.tar.gz
-b92dfe59cb5f7bbc495ed0be50c1c132  Polaris.tar.gz
-8702d138eb61b7149118f91121fe846a  Sunset.tar.gz
-454bdc7321fc18f0db811db722c2e93c  blackslim2.tar.gz
-1ff0ea8d7c73c4f3b32c13a408af3be1  caramel.tar.gz
 432e0d5135be09e03a69f363d3da94a0  cloudy.tar.gz
 34d18380c1077cdf43a04797b2e06734  concept.tar.gz
+eb511cd1217bc0c0bd3fa016698adebc  Crystal.tar.gz
+c7825e925434374a074c4acc46bcdd4f  Galaxy.tar.gz
 d809f2f3cce0eae966296e01ede8df00  gudgreen.tar.gz
+bff16e879b75bd5a442c0c5c7dc22bcb  KeramicRH8.tar.gz
+0154a3eecbeb995865ead852fd5f6bb2  Keramic.tar.gz
 f16d6a1a39b32473a901d9132c405196  lcd.tar.gz
 841924c042ca70700a9d201bc7686e59  mp2k.tar.gz
 3023e8dd6c12902c32b3d99e51fd0c1e  mplayer.tar.gz
+54b3e28494e1d89e041ceace7db32049  OMS_legacy.tar.gz
 7dd4e9e50e0145142982b0537c36f50a  pitt.tar.gz
+b92dfe59cb5f7bbc495ed0be50c1c132  Polaris.tar.gz
+8702d138eb61b7149118f91121fe846a  Sunset.tar.gz
 9ebf98f4434a9fc119f0282806ba9c32  xinium.tar.gz
+75373e8aca45446c3708180596186ad8  xine-ui-0.99.6-20091217.tar.bz2
diff --git a/xine-ui.spec b/xine-ui.spec
index 45d4569..3b76c7f 100644
--- a/xine-ui.spec
+++ b/xine-ui.spec
@@ -1,13 +1,28 @@
 # TODO, sometime: nvtvsimple
 
+# hg version
+%global hgdate 20091217
+
 Summary:        A skinned xlib-based gui for xine-lib
 Name:           xine-ui
-Version:        0.99.5
-Release:        16%{?dist}
+Version:        0.99.6
+Release:        0.1.%{hgdate}hg%{?dist}
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://www.xine-project.org/
-Source0:        http://downloads.sourceforge.net/xine/xine-ui-%{version}.tar.gz
+
+#Source0:        http://downloads.sourceforge.net/xine/xine-ui-%{version}.tar.gz
+
+#Use source from hg for now to fix a few bugs
+#This tarball has been created with
+# hg clone http://hg.debian.org/hg/xine-lib/xine-ui/ xine-ui-0.99.6
+# find xine-ui-0.99.6 -name .hg* -exec rm -rf {} \;
+# find xine-ui-0.99.6 -name .cvs* -exec rm -rf {} \;
+# tar jcf xine-ui-0.99.6-20091217.tar.bz2 xine-ui-0.99.6/
+Source0:	xine-ui-%{version}-%{hgdate}.tar.bz2
+BuildRequires:	autoconf
+BuildRequires:	automake
+
 # Patch to enable linking to shared library version of lirc
 Patch0:         xine-ui-0.99.5-shared-lirc.patch
 # Patch to use UTF-8 documentation, BZ #512598
@@ -110,7 +125,7 @@ This package contains extra skins for xine-ui.
 
 # Backup time stamp
 touch -r m4/_xine.m4 m4/_xine.m4.stamp
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 # and restore it
 touch -r m4/_xine.m4.stamp m4/_xine.m4
@@ -122,10 +137,10 @@ if [ -n "$libx11so" -a -f "$libx11so" ] ; then
     sed -i -e "s/\"libX11\\.so\"/\"$(basename $libx11so)\"/" src/aaui/main.c
 fi
 
-touch -r configure.ac configure.ac.stamp
-sed -i -e 's/LINUX_KD_HB/LINUX_KD_H/g;s|linux/kd\.hb|linux/kd.h|g' \
-    config.h.in configure.ac configure
-touch -r configure.ac.stamp configure.ac
+#touch -r configure.ac configure.ac.stamp
+#sed -i -e 's/LINUX_KD_HB/LINUX_KD_H/g;s|linux/kd\.hb|linux/kd.h|g' \
+#    config.h.in configure.ac configure
+#touch -r configure.ac.stamp configure.ac
 
 for f in doc/man/{de,es,fr}/*.1* doc/README?{cs,de,es,fi,fr,it} ; do
     iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 && \
@@ -150,7 +165,10 @@ find fedoraskins/ -type d -name "CVS" -exec rm -rf {} \; || :
 find fedoraskins/ -type d -name ".xvpics" -exec rm -rf {} \; || :
 
 %build
-%configure --disable-dependency-tracking --enable-vdr-keys --with-aalib XINE_DOCPATH=%{_docdir}/%{name}-%{version}
+./autogen.sh noconfig
+export LIRC_CFLAGS="-llirc_client"
+export LIRC_LIBS="-llirc_client"
+#%configure --disable-dependency-tracking --enable-vdr-keys --with-aalib XINE_DOCPATH=%{_docdir}/%{name}-%{version}
 # Set documentation directory
 make %{?_smp_mflags}
 
@@ -180,12 +198,14 @@ rm -rf %{buildroot}
 %post
 # Mime type
 update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 # Icon cache
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
 # Mime type
 update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 # Icon cache
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
@@ -214,6 +234,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/xine/oxine/
 %{_datadir}/xine/visuals/
 
+%{_datadir}/mime/packages/xine-ui.xml
 %{_datadir}/applications/*xine.desktop
 %{_datadir}/icons/hicolor/*x*/apps/xine.png
 %{_datadir}/pixmaps/xine.xpm
@@ -231,6 +252,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %exclude %{_datadir}/xine/skins/xine_splash.png
 
 %changelog
+* Thu Dec 17 2009 Jussi Lehtola <jussilehtola@fedoraproject.org> - 0.99.6-0.1.20091217hg
+- Switch to development branch by suggestion of upstream to fix some bugs.
+
 * Thu Sep 03 2009 Jussi Lehtola <jussilehtola@fedoraproject.org> - 0.99.5-16
 - Move xine-ui_logo.mpv to main package from -skins.