diff --git a/kasp.xml b/kasp.xml
new file mode 100644
index 0000000..caacca6
--- /dev/null
+++ b/kasp.xml
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+ A default policy that will amaze you and your friends
+
+ PT2H
+ P3D
+
+ P7D
+ P7D
+
+ PT12H
+
+ PT7200S
+
+
+
+
+
+ P100D
+
+ 1
+ 5
+
+
+
+
+
+
+
+ PT3600S
+ PT3600S
+ PT3600S
+
+ P14D
+
+
+
+ 8
+ P1Y
+ AEP
+
+
+
+
+ 8
+ P30D
+ AEP
+
+
+
+
+
+ PT43200S
+
+ PT3600S
+ PT3600S
+ unixtime
+
+
+
+
+ PT9999S
+
+ PT3600S
+
+
+ PT172800S
+ PT10800S
+
+
+
+
+
+
diff --git a/opendnssec.spec b/opendnssec.spec
index 3d5e9eb..a8af86f 100644
--- a/opendnssec.spec
+++ b/opendnssec.spec
@@ -11,6 +11,7 @@ Source2: ods-signerd.init
Source3: ods.sysconfig
Source4: conf.xml
Source5: opendnssec.cron
+Source6: kasp.xml
Patch1: opendnssec-aggressive-retry.patch
Patch2: opendnssec-1.4.0a3-nsec3param.patch
Patch3: opendnssec-1.4.0b1-occluded.patch
@@ -50,16 +51,16 @@ rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
mkdir -p %{buildroot}/var/opendnssec/{tmp,signed,signconf}
mkdir -p %{buildroot}/%{_initrddir}
-install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/ods-enforcerd
-install -m 0755 %{SOURCE2} %{buildroot}/%{_initrddir}/ods-signerd
+install -p -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/ods-enforcerd
+install -p -m 0755 %{SOURCE2} %{buildroot}/%{_initrddir}/ods-signerd
install -d -m 0755 %{buildroot}%{_initrddir} %{buildroot}%{_sysconfdir}/cron.d/
-install -m 0644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/cron.d/opendnssec
+install -p -m 0644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/cron.d/opendnssec
# cleanup sample files
rm -f %{buildroot}/%{_sysconfdir}/opendnssec/*.sample
install -d -m 0755 %{buildroot}/%{_sysconfdir}/sysconfig
-install -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/ods
-install -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/opendnssec/
+install -p -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/ods
+install -p -m 0644 %{SOURCE4} %{SOURCE6} %{buildroot}/%{_sysconfdir}/opendnssec/
mkdir -p %{buildroot}%{_localstatedir}/run/opendnssec
%files
diff --git a/sources b/sources
index 4a27788..bcdf49c 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-c7e00424dbbf87ccf4667f3b397b0aa1 opendnssec-1.4.0a1.tar.gz
-=======
->>>>>>> b55d6a7... * Tue Oct 30 2012 Paul Wouters - 1.4.0-0.4.b1
c5951e833a9414e3cbe575e7c66ee3ee opendnssec-1.4.0b1.tar.gz