diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e69de29..0000000
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7cede56
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+vdr-streamdev-0.3.4.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/sources b/sources
index e69de29..ef4d671 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+dcbe6cb0974a5ff43a1b9bb22086ec64  vdr-streamdev-0.3.4.tgz
diff --git a/vdr-streamdev-client.conf b/vdr-streamdev-client.conf
new file mode 100644
index 0000000..ee2f68d
--- /dev/null
+++ b/vdr-streamdev-client.conf
@@ -0,0 +1,5 @@
+# Configuration snippet for vdr-streamdev-client                         -*- sh -*-
+#
+# Add command line options to pass to the streamdev-client plugin to PLUGIN_OPTIONS.
+
+PLUGIN_OPTIONS=""
diff --git a/vdr-streamdev-server.conf b/vdr-streamdev-server.conf
new file mode 100644
index 0000000..52c11cf
--- /dev/null
+++ b/vdr-streamdev-server.conf
@@ -0,0 +1,5 @@
+# Configuration snippet for vdr-streamdev-server                          -*- sh -*-
+#
+# Add command line options to pass to the streamdev-server plugin to PLUGIN_OPTIONS.
+
+PLUGIN_OPTIONS=""
diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec
new file mode 100644
index 0000000..3432887
--- /dev/null
+++ b/vdr-streamdev.spec
@@ -0,0 +1,81 @@
+%define pname     streamdev
+%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:        2%{?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
+# 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
+
+%description
+The streamdev plugin adds streaming capabilities to your VDR.
+
+%package server
+Summary:        Streaming server plugin for VDR
+Group:          Applications/Multimedia
+Requires:       vdr(abi) = %{apiver}
+
+%description server
+Lets your VDR act as a streaming server for other clients.
+This will let you watch TV or Recordings across the network.
+
+%package client
+Summary:        Streaming client plugin for VDR
+Group:          Applications/Multimedia
+Requires:       vdr(abi) = %{apiver}
+
+%description client
+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}
+
+%build
+make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr all
+
+%install
+rm -rf $RPM_BUILD_ROOT
+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 %{SOURCE1} \
+  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf
+install -Dpm 644 %{SOURCE2} \
+  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files server
+%defattr(-,root,root,-)
+%{plugindir}/libvdr-%{pname}-server.so.%{apiver}
+%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf
+%config(noreplace) %{configdir}/plugins/streamdevhosts.conf
+%doc CONTRIBUTORS COPYING HISTORY PROTOCOL README
+
+%files client
+%defattr(-,root,root,-)
+%{plugindir}/libvdr-%{pname}-client.so.%{apiver}
+%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf
+%doc CONTRIBUTORS COPYING HISTORY PROTOCOL README
+
+%changelog
+* Sat Aug 30 2008 Felix Kaechele <felix at fetzig dot org> - 0.3.4-2
+- Incorporated fixes suggested in bug #454120
+* Fri Jul  4 2008 Felix Kaechele <felix at fetzig dot org> - 0.3.4-1
+- Initial Build