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..1e0fa2a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+ucview-0.22.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index fdfb55d..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: ucview
-# $Id$
-NAME := ucview
-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..3d2fd97 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+1b43c823624962bde3248ae493995750  ucview-0.22.tar.gz
diff --git a/ucview.desktop b/ucview.desktop
new file mode 100644
index 0000000..82300f2
--- /dev/null
+++ b/ucview.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=UCView
+GenericName=Image Capture Application
+Type=Application
+Comment=Capture video images
+Exec=ucview
+TryExec=ucview
+Icon=ucview
+Terminal=false
+Categories=Application;AudioVideo;Video;
+StartupNotify=true
diff --git a/ucview.spec b/ucview.spec
new file mode 100644
index 0000000..4fbebe4
--- /dev/null
+++ b/ucview.spec
@@ -0,0 +1,113 @@
+Summary:          Image and video capture application using unicap toolkit
+Name:             ucview
+Version:          0.22
+Release:          2%{?dist}
+License:          GPLv2+
+Group:            Applications/Multimedia
+URL:              http://www.unicap-imaging.org/
+Source0:          http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz
+Source1:          %{name}.desktop
+BuildRequires:    intltool, /usr/bin/perl, perl(XML::Parser), gettext
+BuildRequires:    unicap-devel >= 0.2.23, gtk2-devel >= 2.8.0, libglade2-devel
+BuildRequires:    glib2-devel, GConf2-devel, libXv-devel, desktop-file-utils
+BuildRequires:    libtheora-devel, libvorbis-devel, dbus-glib-devel >= 0.73
+Requires:         hicolor-icon-theme
+Requires(pre):    GConf2
+Requires(post):   GConf2, scrollkeeper
+Requires(preun):  GConf2
+Requires(postun): scrollkeeper
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+UCView is a video image capture application using the unicap toolkit.
+It provides a simple way to parametrise the video device, can capture
+still images from the video stream or record the stream as mpeg file.
+By using unicap, it can access many different video capture devices
+like webcams, video grabber boards, IEEE-1394 (FireWire) cameras and
+others.
+
+%prep
+%setup -q
+
+%build
+%configure --disable-schemas-install
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+make DESTDIR=$RPM_BUILD_ROOT install
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
+# Install a working ucview.desktop file
+desktop-file-install --vendor "" --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
+
+# Don't install header files for ucview
+rm -rf $RPM_BUILD_ROOT%{_includedir}
+
+# Don't install any static .a and libtool .la files
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.{a,la}
+
+%find_lang %{name}
+
+%pre
+if [ $1 -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null 2>&1 || :
+fi
+
+%post
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null 2>&1 || :
+
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
+%preun
+if [ $1 -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null 2>&1 || :
+fi
+
+%postun
+scrollkeeper-update -q || :
+
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files -f %{name}.lang
+%defattr(-,root,root)
+%doc AUTHORS COPYING ChangeLog
+%{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_bindir}/%{name}
+%{_libdir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/dbus-1/services/*.service
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_mandir}/man1/%{name}.1*
+
+%changelog
+* Sun Oct 19 2008 Robert Scheck <robert@fedoraproject.org> 0.22-2
+- Rebuild against unicap 0.93
+
+* Mon Oct 13 2008 Robert Scheck <robert@fedoraproject.org> 0.22-1
+- Upgrade to 0.22
+
+* Sun Jul 27 2008 Robert Scheck <robert@fedoraproject.org> 0.21-1
+- Upgrade to 0.21
+
+* Mon May 19 2008 Robert Scheck <robert@fedoraproject.org> 0.20.1-1
+- Upgrade to 0.20.1
+
+* Sun May 18 2008 Robert Scheck <robert@fedoraproject.org> 0.17-1
+- Upgrade to 0.17
+- Initial spec file for Fedora and Red Hat Enterprise Linux