diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 04204c7..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-config
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b670c5e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+config
+crontab
+run-parts
+000-delay.cron
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 10e4626..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: crontabs
-# $Id: Makefile,v 1.1 2004/09/09 03:58:16 cvsdist Exp $
-NAME := crontabs
-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),)
-# attempt 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/crontabs.spec b/crontabs.spec
index 9934907..d56f473 100644
--- a/crontabs.spec
+++ b/crontabs.spec
@@ -1,12 +1,13 @@
 Summary: Root crontab files used to schedule the execution of programs
 Name: crontabs
 Version: 1.10
-Release: 23%{?dist}
+Release: 26%{?dist}
 License: Public Domain and GPLv2
 Group: System Environment/Base
 Source0: crontab
 Source1: run-parts
-Source2: config
+Source2: 000-delay.cron
+Source3: config
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,11 +23,15 @@ your system.
 
 %install
 rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/etc/cron.{hourly,daily,weekly,monthly}
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
-cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/crontab
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/crontab
 install -m644 $RPM_SOURCE_DIR/crontab $RPM_BUILD_ROOT/etc/crontab
 install -m755 $RPM_SOURCE_DIR/run-parts $RPM_BUILD_ROOT/usr/bin/run-parts
+install -m755 $RPM_SOURCE_DIR/000-delay.cron $RPM_BUILD_ROOT/etc/cron.daily/000-delay.cron
+ln -s ../cron.daily/000-delay.cron $RPM_BUILD_ROOT/etc/cron.weekly/000-delay.cron
+ln -s ../cron.daily/000-delay.cron $RPM_BUILD_ROOT/etc/cron.monthly/000-delay.cron
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -36,8 +41,23 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/crontab
 %{_bindir}/run-parts
 %config(noreplace) /etc/sysconfig/crontab
+%dir /etc/cron.hourly
+%dir /etc/cron.daily
+%dir /etc/cron.weekly
+%dir /etc/cron.monthly
+%dir /etc/cron.daily/000-delay.cron
+%dir /etc/cron.weekly/000-delay.cron
+%dir /etc/cron.monthly/000-delay.cron
+%config(noreplace) /etc/sysconfig/crontab
 
 %changelog
+* Thu Jan 28 2009 Marcela Maslanova <mmaslano@redhat.com> 1.10-26
+- 477709 hack around jobs running twice
+- switch off random delay for anacron jobs as default in sysconfig
+
+* Mon Dec  1 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> 1.10-25
+- Added /etc/cron.{hourly,daily,weekly,monthly} dirs again. bz#473353
+
 * Mon Jun  9 2008 Marcela Maslanova <mmaslano@redhat.com> 1.10-23
 - 450084 LANG=C is set up for running scripts
 
diff --git a/sources b/sources
index ba72251..c71d3b0 100644
--- a/sources
+++ b/sources
@@ -1 +1,4 @@
 ba1e7d606a110d281c16d9d49c6f335d  config
+03fa15e550843194a8ba55b473a6549a  crontab
+9b3ddd391150661ba50667a2a32cbda6  run-parts
+159145e4bdd9f0fc6efaf040cba3480c  000-delay.cron