diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 7cede56..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-vdr-streamdev-0.3.4.tgz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..47206c7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+vdr-streamdev-0.5.0-pre-20090706.tgz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 2519cfd..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: vdr-streamdev
-# $Id$
-NAME := vdr-streamdev
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/import.log b/import.log
deleted file mode 100644
index 9c01806..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-vdr-streamdev-0_3_4-2_fc9:HEAD:vdr-streamdev-0.3.4-2.fc9.src.rpm:1221203534
diff --git a/sources b/sources
index ef4d671..9b7b612 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dcbe6cb0974a5ff43a1b9bb22086ec64  vdr-streamdev-0.3.4.tgz
+4675d8cd204defad941c65b020bfb04a  vdr-streamdev-0.5.0-pre-20090706.tgz
diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec
index 1483b6a..9e74a88 100644
--- a/vdr-streamdev.spec
+++ b/vdr-streamdev.spec
@@ -1,23 +1,25 @@
 %define pname     streamdev
+%define prever    20090706
 %define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
 %define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
 %define configdir %(vdr-config --configdir  2>/dev/null || echo ERROR)
 
 Name:           vdr-%{pname}
-Version:        0.3.4
-Release:        3%{?dist}
+Version:        0.5.0
+Release:        0.2.pre%{prever}%{?dist}
 Summary:        Streaming plugin for VDR
 
 Group:          Applications/Multimedia
 License:        GPL+ and GPLv2+
 URL:            http://streamdev.vdr-developer.org
-Source0:        http://streamdev.vdr-developer.org/releases/vdr-streamdev-%{version}.tgz
+Source0:        http://streamdev.vdr-developer.org/releases/vdr-streamdev-%{version}%{?prever:-pre-%{prever}}.tgz
 # Configuration files for plugin parameters. These are Fedora specific and not in upstream.
 Source1:        %{name}-server.conf
 Source2:        %{name}-client.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  vdr-devel >= 1.3.47
+BuildRequires:  gettext
 
 %description
 The streamdev plugin adds streaming capabilities to your VDR.
@@ -41,10 +43,16 @@ Lets your VDR in conjunction with a streamdev-server act as a streaming client.
 VDR will then be able to work even without a DVB device.
 
 %prep
-%setup -q -n %{pname}-%{version}
+%setup -q -n %{pname}-%{version}%{?prever:-pre-%{prever}}
+
+for f in CONTRIBUTORS HISTORY; do
+  iconv -f iso8859-1 -t utf-8 $f >$f.conv
+  touch -r $f $f.conv
+  mv $f.conv $f
+done
 
 %build
-make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr all
+make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr LOCALEDIR=$RPM_BUILD_ROOT%{_libdir}/vdr/locale all
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -52,7 +60,8 @@ install -dm 755 $RPM_BUILD_ROOT%{plugindir}
 install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins
 install -pm 755 libvdr-%{pname}-server.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
 install -pm 755 libvdr-%{pname}-client.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
-install -Dpm 644 streamdevhosts.conf.example $RPM_BUILD_ROOT%{configdir}/plugins/streamdevhosts.conf
+install -Dpm 644 streamdev/streamdevhosts.conf $RPM_BUILD_ROOT%{configdir}/plugins/streamdevhosts.conf
+install -Dpm 755 streamdev/externremux.sh $RPM_BUILD_ROOT%{_libdir}/vdr/bin/externremux.sh 
 install -Dpm 644 %{SOURCE1} \
   $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf
 install -Dpm 644 %{SOURCE2} \
@@ -64,6 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 %files server
 %defattr(-,root,root,-)
 %{plugindir}/libvdr-%{pname}-server.so.%{apiver}
+%{_libdir}/vdr/bin/externremux.sh
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf
 %config(noreplace) %{configdir}/plugins/streamdevhosts.conf
 %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README
@@ -75,6 +85,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README
 
 %changelog
+* Sat Jan 02 2010 Felix Kaechele <heffer@fedoraproject.org> - 0.5.0-0.2.pre20090706
+- added missing BuildReq: gettext
+
+* Fri Dec 18 2009 Felix Kaechele <heffer@fedoraproject.org> - 0.5.0-0.1.pre20090706
+- update to latest version
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild