diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 7053e9c..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-wallpapoz-0.4.1-svn87_trunk.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3522c65
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+wallpapoz-0.4.1-svn92_trunk.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index de8ef26..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: wallpapoz
-# $Id$
-NAME := wallpapoz
-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/daemon_wallpapoz-wrapper b/daemon_wallpapoz-wrapper
new file mode 100644
index 0000000..76a92cc
--- /dev/null
+++ b/daemon_wallpapoz-wrapper
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+pgrep -U $(id -u) -f daemon_wallpapoz | while read daemon_pid
+do
+	pgrep -U $(id -u) -f python | while read python_pid
+	do
+		if [ $daemon_pid = $python_pid ]
+		then
+			/usr/bin/kill -SIGTERM $daemon_pid
+		fi
+	done
+done
+exec /usr/libexec/daemon_wallpapoz "$@"
diff --git a/sources b/sources
index 6758522..e1f4d70 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dcdc89bee9b1e35e000f99f104a39774  wallpapoz-0.4.1-svn87_trunk.tar.bz2
+5a993e9618690681805124f78c141170  wallpapoz-0.4.1-svn92_trunk.tar.bz2
diff --git a/wallpapoz.spec b/wallpapoz.spec
index 623dc0e..21f25b0 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -1,5 +1,5 @@
 # For svn version: do
-# $ svn checkout http://opensvn.csie.org/wallpapoz/trunk wallpapoz-%%{mainver}
+# $ svn checkout http://opensvn.csie.org/wallpapoz/trunk wallpapoz-%%{mainver}%%{?svnver:-svn%%svnver}
 # $ tar -cjf %%{name}-%%{mainver}%%{?svnver:-svn%%svnver}.tar.bz2 %%{name}-%%{mainver}/
 
 %define         srcurl          http://wallpapoz.akbarhome.com/
@@ -7,8 +7,8 @@
 
 %define         mainver         0.4.1
 %undefine         betaver
-%define         svnver          svn87_trunk
-%define         fedorarel       7
+%define         svnver          svn92_trunk
+%define         fedorarel       10
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -21,6 +21,10 @@ Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            %{srcurl}
 Source0:        %{srcurl}files/%{name}-%{mainver}%{?svnver:-%svnver}%{?betaver:%betaver}.tar.bz2
+Source10:       daemon_wallpapoz-wrapper
+%if 0%{?fedora} >= 12
+Source11:	wallpapoz-autostart.desktop
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -51,7 +55,6 @@ wallpapers for different workspaces or virtual desktops.
 
 %prep
 %setup -q -n %{name}-%{version}%{?svnver:-%svnver}
-sed -i.cs -e '/DOC_ISO_CODES/s|"ru"|"ru","cs"|' setup.py
 
 %build
 
@@ -69,6 +72,22 @@ desktop-file-install \
    --delete-original \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
+# Install daemon_wallpapoz-wrapper, move the original one
+# to %%_libexecdir
+%{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir}
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/daemon_wallpapoz \
+	$RPM_BUILD_ROOT%{_libexecdir}/
+%{__install} -cpm 0755 %{SOURCE10} \
+	$RPM_BUILD_ROOT%{_bindir}/daemon_wallpapoz
+
+# Install desktop application autostart stuff
+%if 0%{?fedora} >= 12
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart
+desktop-file-install \
+	--dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart \
+	%{SOURCE11}
+%endif
+
 %{find_lang} %{name}
 
 %clean
@@ -78,6 +97,11 @@ desktop-file-install \
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/*%{name}
+%{_libexecdir}/daemon_wallpapoz
+
+%if 0%{?fedora} >= 12
+%{_sysconfdir}/xdg/autostart/wallpapoz-autostart.desktop
+%endif
 
 %{_datadir}/%{name}/
 %{_datadir}/gnome/help/%{name}/
@@ -86,6 +110,22 @@ desktop-file-install \
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sun Aug 30 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.4.1-10.svn92_trunk
+- Update to rev 92
+- Install desktop application autostart stuff on F-12+
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.4.1-9.svn87_trunk
+- F-12: Mass rebuild
+
+* Tue Feb 24 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
+- F-11: Mass rebuild
+
+* Wed Jan 21 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.4.1-8.svn87_trunk
+- Always once kill daemon_wallpapoz process if it exists before start
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com>
+- F-11: Rebuild for Python 2.6
+
 * Wed Aug 27 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.4.1-7.svn87_trunk
 - F-10+: Add (Build)Requires: gnome-python2-gnome (bug 456122, 460022)