diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 3a531a0..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-vdr-ttxtsubs-0.0.5-raastinrauta-edition.diff.gz
-vdr-ttxtsubs-0.0.5.tgz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c899d99
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+vdr-ttxtsubs-0.0.6.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 506b757..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: vdr-ttxtsubs
-# $Id$
-NAME := vdr-ttxtsubs
-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/sources b/sources
index 9716aa1..684b418 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-bea48116e61eb9c737021d05a7c092a1  vdr-ttxtsubs-0.0.5.tgz
-eccfd7fca4ba6392aff1ecf654aaa2cd  vdr-ttxtsubs-0.0.5-raastinrauta-edition.diff.gz
+eba81ec1dd347121da3e139afee1e908  vdr-ttxtsubs-0.0.6.tar.gz
diff --git a/vdr-ttxtsubs.spec b/vdr-ttxtsubs.spec
index 8f065f5..cdafdcb 100644
--- a/vdr-ttxtsubs.spec
+++ b/vdr-ttxtsubs.spec
@@ -5,19 +5,19 @@
 %define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
 
 Name:           vdr-%{pname}
-Version:        0.0.5
-Release:        5%{?dist}
+Version:        0.0.6
+Release:        1%{?dist}
 Summary:        Teletext subtitles plugin for VDR
 
 Group:          Applications/Multimedia
 License:        GPL+
-URL:            http://www.nada.kth.se/~ragge/vdr/ttxtsubs/
-Source0:        ftp://ftp.nada.kth.se/pub/home/ragge/vdr/%{name}-%{version}.tgz
+URL:            http://projects.vdr-developer.org/projects/show/plg-ttxtsubs
+Source0:        http://projects.vdr-developer.org/attachments/download/12/%{name}-%{version}.tar.gz
 Source1:        %{name}.conf
-Patch0:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-ttxtsubs-0.0.5-raastinrauta-edition.diff.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  vdr-devel
+BuildRequires:  vdr-devel >= 1.6.0
+BuildRequires:  gettext
 Requires:       vdr(abi) = %{apiver}
 
 %description
@@ -27,7 +27,6 @@ teletext based subtitles using the on screen display.
 
 %prep
 %setup -q -n %{pname}-%{version}
-%patch0 -p1
 sed -i -e '/^DVBDIR/d' -e 's|-I$(DVBDIR)/include||' Makefile
 f=HISTORY ; iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
 sed -i -e 's|ConfigDirectory("ttxtsubs")|"%{vardir}/%{pname}"|' \
@@ -35,34 +34,47 @@ sed -i -e 's|ConfigDirectory("ttxtsubs")|"%{vardir}/%{pname}"|' \
 
 
 %build
-make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr libvdr-%{pname}.so
+make %{?_smp_mflags} LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr all
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 install -dm 755 $RPM_BUILD_ROOT%{plugindir}
 install -pm 755 libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
+
 install -Dpm 644 %{SOURCE1} \
   $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
+
 install -dm 755 $RPM_BUILD_ROOT%{vardir}/%{pname}
 cat /dev/null >$RPM_BUILD_ROOT%{vardir}/%{pname}/channelsettings.dat
 
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
+cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
+%find_lang %{name}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
+%defattr(-,%{vdr_user},root,-)
+%dir %{vardir}/%{pname}/
+%ghost %config(noreplace) %{vardir}/%{pname}/channelsettings.dat
 %defattr(-,root,root,-)
 %doc COPYING HISTORY README TROUBLESHOOTING
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
 %{plugindir}/libvdr-%{pname}.so.%{apiver}
-%defattr(-,%{vdr_user},root,-)
-%dir %{vardir}/%{pname}/
-%ghost %config(noreplace) %{vardir}/%{pname}/channelsettings.dat
 
 
 %changelog
+* Mon Dec 15 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6-1
+- 0.0.6 (new community upstream), patches applied upstream.
+
+* Mon Nov 24 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.0.5-6
+- Rebuild.
+
 * Mon Apr  7 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.0.5-5
 - Rebuild for VDR 1.6.0.