diff --git a/krb5-mini.changes b/krb5-mini.changes
index a3e08cc..0525ee9 100644
--- a/krb5-mini.changes
+++ b/krb5-mini.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct  5 15:50:38 CEST 2012 - mc@suse.de
+
+- add systemd service files for kadmind, krb5kdc and kpropd
+- add sysconfig templates for kadmind and krb5kdc
+
 -------------------------------------------------------------------
 Wed Jun 13 08:40:56 UTC 2012 - coolo@suse.com
 
diff --git a/krb5-mini.spec b/krb5-mini.spec
index 784d67c..3470c16 100644
--- a/krb5-mini.spec
+++ b/krb5-mini.spec
@@ -30,6 +30,9 @@ BuildRequires:  keyutils-devel
 BuildRequires:  libcom_err-devel
 BuildRequires:  libselinux-devel
 BuildRequires:  ncurses-devel
+%if 0%{?suse_version} >= 1210
+BuildRequires:  systemd
+%endif
 Version:        1.10.2
 Release:        0
 Summary:        MIT Kerberos5 Implementation--Libraries
@@ -89,6 +92,7 @@ Group:          Productivity/Networking/Security
 Requires:       cron
 Requires:       logrotate
 Requires:       perl-Date-Calc
+%{?systemd_requires}
 PreReq:         %insserv_prereq %fillup_prereq
 
 %description server
@@ -235,15 +239,27 @@ mkdir -p %{buildroot}%{_sysconfdir}/init.d
 install -m 755 %{vendorFiles}/kadmind.init %{buildroot}%{_sysconfdir}/init.d/kadmind
 install -m 755 %{vendorFiles}/krb5kdc.init %{buildroot}%{_sysconfdir}/init.d/krb5kdc
 install -m 755 %{vendorFiles}/kpropd.init  %{buildroot}%{_sysconfdir}/init.d/kpropd
+# install systemd files
+%if 0%{?suse_version} >= 1210
+mkdir -p %{buildroot}%{_unitdir}
+install -m 644 %{vendorFiles}/kadmind.service %{buildroot}%{_unitdir}
+install -m 644 %{vendorFiles}/krb5kdc.service %{buildroot}%{_unitdir}
+install -m 644 %{vendorFiles}/kpropd.service %{buildroot}%{_unitdir}
+%endif
+# install sysconfig templates
+mkdir -p $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates
+install -m 644 %{vendorFiles}/sysconfig.kadmind $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates/
+install -m 644 %{vendorFiles}/sysconfig.krb5kdc $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates/
 # install logrotate files
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 install -m 644 %{vendorFiles}/krb5-server.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/krb5-server
 find . -type f -name '*.ps' -exec gzip -9 {} \;
 # create rc* links 
 mkdir -p %{buildroot}/usr/bin/
-ln -sf ../../etc/init.d/kadmind %{buildroot}/usr/bin/rckadmind
-ln -sf ../../etc/init.d/krb5kdc %{buildroot}/usr/bin/rckrb5kdc
-ln -sf ../../etc/init.d/kpropd %{buildroot}/usr/bin/rckpropd
+mkdir -p %{buildroot}/usr/sbin/
+ln -sf ../../etc/init.d/kadmind %{buildroot}/usr/sbin/rckadmind
+ln -sf ../../etc/init.d/krb5kdc %{buildroot}/usr/sbin/rckrb5kdc
+ln -sf ../../etc/init.d/kpropd %{buildroot}/usr/sbin/rckpropd
 # create links for kinit and klist, because of the java ones
 ln -sf ../../usr/lib/mit/bin/kinit   %{buildroot}/usr/bin/kinit
 ln -sf ../../usr/lib/mit/bin/klist   %{buildroot}/usr/bin/klist
@@ -264,40 +280,81 @@ rm -rf %{buildroot}/usr/lib/mit/share
 #####################################################
 %if %{build_mini}
 
-%preun 
+%preun
+%if 0%{?suse_version} >= 1210
+%service_del_preun krb5kdc.service kadmind.service kpropd.service
+%else
 %stop_on_removal krb5kdc kadmind kpropd
+%endif
 
-%postun 
+%postun
 /sbin/ldconfig
+%if 0%{?suse_version} >= 1210
+%service_del_postun krb5kdc.service kadmind.service kpropd.service
+%else
 %restart_on_update krb5kdc kadmind kpropd
 %{insserv_cleanup}
+%endif
+
+%post
+/sbin/ldconfig
+%if 0%{?suse_version} >= 1210
+%service_add_post krb5kdc.service kadmind.service kpropd.service
+%endif
 
-%post -p /sbin/ldconfig
 %else
 #####################################################
 # krb5 pre/post/postun
 #####################################################
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+
+#####################################################
+# krb5-server preun/postun/pre/post
+#####################################################
 
 %preun server
-#####################################################
-# krb5-server preun/postun
-#####################################################
+%if 0%{?suse_version} >= 1210
+%service_del_preun krb5kdc.service kadmind.service kpropd.service
+%else
 %stop_on_removal krb5kdc kadmind kpropd
+%endif
 
 %postun server
+%if 0%{?suse_version} >= 1210
+%service_del_postun krb5kdc.service kadmind.service kpropd.service
+%else
 %restart_on_update krb5kdc kadmind kpropd
 %{insserv_cleanup}
+%endif
+
+%post server
+%if 0%{?suse_version} >= 1210
+%service_add_post krb5kdc.service kadmind.service kpropd.service
+%endif
+%{fillup_only -n kadmind}
+%{fillup_only -n krb5kdc}
+%{fillup_only -n kpropd}
+
+%pre server
+%if 0%{?suse_version} >= 1210
+%service_add_pre krb5kdc.service kadmind.service kpropd.service
+%endif
+
 #####################################################
 # krb5-plugin-kdb-ldap post/postun
 #####################################################
 
-%post plugin-kdb-ldap -p /sbin/ldconfig
+%post plugin-kdb-ldap
+/sbin/ldconfig
+
+%postun plugin-kdb-ldap
+/sbin/ldconfig
 
-%postun plugin-kdb-ldap -p /sbin/ldconfig
 %endif
 
 ########################################################
@@ -327,6 +384,7 @@ rm -rf %{buildroot}/usr/lib/mit/share
 %{_mandir}/man1/krb5-send-pr.1*
 %{_mandir}/man1/krb5-config.1*
 %{_datadir}/aclocal/ac_check_krb5.m4
+
 %if %{build_mini}
 
 %files
@@ -352,7 +410,11 @@ rm -rf %{buildroot}/usr/lib/mit/share
 %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.acl
 %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k*
+%{_var}/adm/fillup-templates/sysconfig.*
 %{_sysconfdir}/init.d/*
+%if 0%{?suse_version} >= 1210
+%{_unitdir}/*.service
+%endif
 %{_libdir}/libgssapi_krb5.*
 %{_libdir}/libgssrpc.so.*
 %{_libdir}/libk5crypto.so.*
@@ -395,7 +457,7 @@ rm -rf %{buildroot}/usr/lib/mit/share
 /usr/lib/mit/bin/sim_client
 /usr/bin/kinit
 /usr/bin/klist
-/usr/bin/rc*
+/usr/sbin/rc*
 #%{_mandir}/man1/*
 %{_mandir}/man1/kvno.1*
 %{_mandir}/man1/kinit.1*
@@ -446,6 +508,11 @@ rm -rf %{buildroot}/usr/lib/mit/share
 %{_sysconfdir}/init.d/kadmind
 %{_sysconfdir}/init.d/krb5kdc
 %{_sysconfdir}/init.d/kpropd
+%if 0%{?suse_version} >= 1210
+%{_unitdir}/kadmind.service
+%{_unitdir}/krb5kdc.service
+%{_unitdir}/kpropd.service
+%endif
 %dir %{krb5docdir}
 %dir /usr/lib/mit
 %dir /usr/lib/mit/sbin
@@ -458,7 +525,8 @@ rm -rf %{buildroot}/usr/lib/mit/share
 %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.acl
 %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k*
-/usr/bin/rc*
+%{_var}/adm/fillup-templates/sysconfig.*
+/usr/sbin/rc*
 /usr/lib/mit/sbin/kadmin.local
 /usr/lib/mit/sbin/kadmind
 /usr/lib/mit/sbin/kpropd
diff --git a/krb5.changes b/krb5.changes
index a3e08cc..0525ee9 100644
--- a/krb5.changes
+++ b/krb5.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct  5 15:50:38 CEST 2012 - mc@suse.de
+
+- add systemd service files for kadmind, krb5kdc and kpropd
+- add sysconfig templates for kadmind and krb5kdc
+
 -------------------------------------------------------------------
 Wed Jun 13 08:40:56 UTC 2012 - coolo@suse.com
 
diff --git a/krb5.spec b/krb5.spec
index 9f9bef5..60405de 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -30,6 +30,9 @@ BuildRequires:  keyutils-devel
 BuildRequires:  libcom_err-devel
 BuildRequires:  libselinux-devel
 BuildRequires:  ncurses-devel
+%if 0%{?suse_version} >= 1210
+BuildRequires:  systemd
+%endif
 Version:        1.10.2
 Release:        0
 Summary:        MIT Kerberos5 Implementation--Libraries
@@ -89,6 +92,7 @@ Group:          Productivity/Networking/Security
 Requires:       cron
 Requires:       logrotate
 Requires:       perl-Date-Calc
+%{?systemd_requires}
 PreReq:         %insserv_prereq %fillup_prereq
 
 %description server
@@ -235,15 +239,27 @@ mkdir -p %{buildroot}%{_sysconfdir}/init.d
 install -m 755 %{vendorFiles}/kadmind.init %{buildroot}%{_sysconfdir}/init.d/kadmind
 install -m 755 %{vendorFiles}/krb5kdc.init %{buildroot}%{_sysconfdir}/init.d/krb5kdc
 install -m 755 %{vendorFiles}/kpropd.init  %{buildroot}%{_sysconfdir}/init.d/kpropd
+# install systemd files
+%if 0%{?suse_version} >= 1210
+mkdir -p %{buildroot}%{_unitdir}
+install -m 644 %{vendorFiles}/kadmind.service %{buildroot}%{_unitdir}
+install -m 644 %{vendorFiles}/krb5kdc.service %{buildroot}%{_unitdir}
+install -m 644 %{vendorFiles}/kpropd.service %{buildroot}%{_unitdir}
+%endif
+# install sysconfig templates
+mkdir -p $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates
+install -m 644 %{vendorFiles}/sysconfig.kadmind $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates/
+install -m 644 %{vendorFiles}/sysconfig.krb5kdc $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates/
 # install logrotate files
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 install -m 644 %{vendorFiles}/krb5-server.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/krb5-server
 find . -type f -name '*.ps' -exec gzip -9 {} \;
 # create rc* links 
 mkdir -p %{buildroot}/usr/bin/
-ln -sf ../../etc/init.d/kadmind %{buildroot}/usr/bin/rckadmind
-ln -sf ../../etc/init.d/krb5kdc %{buildroot}/usr/bin/rckrb5kdc
-ln -sf ../../etc/init.d/kpropd %{buildroot}/usr/bin/rckpropd
+mkdir -p %{buildroot}/usr/sbin/
+ln -sf ../../etc/init.d/kadmind %{buildroot}/usr/sbin/rckadmind
+ln -sf ../../etc/init.d/krb5kdc %{buildroot}/usr/sbin/rckrb5kdc
+ln -sf ../../etc/init.d/kpropd %{buildroot}/usr/sbin/rckpropd
 # create links for kinit and klist, because of the java ones
 ln -sf ../../usr/lib/mit/bin/kinit   %{buildroot}/usr/bin/kinit
 ln -sf ../../usr/lib/mit/bin/klist   %{buildroot}/usr/bin/klist
@@ -264,40 +280,81 @@ rm -rf %{buildroot}/usr/lib/mit/share
 #####################################################
 %if %{build_mini}
 
-%preun 
+%preun
+%if 0%{?suse_version} >= 1210
+%service_del_preun krb5kdc.service kadmind.service kpropd.service
+%else
 %stop_on_removal krb5kdc kadmind kpropd
+%endif
 
-%postun 
+%postun
 /sbin/ldconfig
+%if 0%{?suse_version} >= 1210
+%service_del_postun krb5kdc.service kadmind.service kpropd.service
+%else
 %restart_on_update krb5kdc kadmind kpropd
 %{insserv_cleanup}
+%endif
+
+%post
+/sbin/ldconfig
+%if 0%{?suse_version} >= 1210
+%service_add_post krb5kdc.service kadmind.service kpropd.service
+%endif
 
-%post -p /sbin/ldconfig
 %else
 #####################################################
 # krb5 pre/post/postun
 #####################################################
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+
+#####################################################
+# krb5-server preun/postun/pre/post
+#####################################################
 
 %preun server
-#####################################################
-# krb5-server preun/postun
-#####################################################
+%if 0%{?suse_version} >= 1210
+%service_del_preun krb5kdc.service kadmind.service kpropd.service
+%else
 %stop_on_removal krb5kdc kadmind kpropd
+%endif
 
 %postun server
+%if 0%{?suse_version} >= 1210
+%service_del_postun krb5kdc.service kadmind.service kpropd.service
+%else
 %restart_on_update krb5kdc kadmind kpropd
 %{insserv_cleanup}
+%endif
+
+%post server
+%if 0%{?suse_version} >= 1210
+%service_add_post krb5kdc.service kadmind.service kpropd.service
+%endif
+%{fillup_only -n kadmind}
+%{fillup_only -n krb5kdc}
+%{fillup_only -n kpropd}
+
+%pre server
+%if 0%{?suse_version} >= 1210
+%service_add_pre krb5kdc.service kadmind.service kpropd.service
+%endif
+
 #####################################################
 # krb5-plugin-kdb-ldap post/postun
 #####################################################
 
-%post plugin-kdb-ldap -p /sbin/ldconfig
+%post plugin-kdb-ldap
+/sbin/ldconfig
+
+%postun plugin-kdb-ldap
+/sbin/ldconfig
 
-%postun plugin-kdb-ldap -p /sbin/ldconfig
 %endif
 
 ########################################################
@@ -327,6 +384,7 @@ rm -rf %{buildroot}/usr/lib/mit/share
 %{_mandir}/man1/krb5-send-pr.1*
 %{_mandir}/man1/krb5-config.1*
 %{_datadir}/aclocal/ac_check_krb5.m4
+
 %if %{build_mini}
 
 %files
@@ -352,7 +410,11 @@ rm -rf %{buildroot}/usr/lib/mit/share
 %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.acl
 %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k*
+%{_var}/adm/fillup-templates/sysconfig.*
 %{_sysconfdir}/init.d/*
+%if 0%{?suse_version} >= 1210
+%{_unitdir}/*.service
+%endif
 %{_libdir}/libgssapi_krb5.*
 %{_libdir}/libgssrpc.so.*
 %{_libdir}/libk5crypto.so.*
@@ -395,7 +457,7 @@ rm -rf %{buildroot}/usr/lib/mit/share
 /usr/lib/mit/bin/sim_client
 /usr/bin/kinit
 /usr/bin/klist
-/usr/bin/rc*
+/usr/sbin/rc*
 #%{_mandir}/man1/*
 %{_mandir}/man1/kvno.1*
 %{_mandir}/man1/kinit.1*
@@ -446,6 +508,11 @@ rm -rf %{buildroot}/usr/lib/mit/share
 %{_sysconfdir}/init.d/kadmind
 %{_sysconfdir}/init.d/krb5kdc
 %{_sysconfdir}/init.d/kpropd
+%if 0%{?suse_version} >= 1210
+%{_unitdir}/kadmind.service
+%{_unitdir}/krb5kdc.service
+%{_unitdir}/kpropd.service
+%endif
 %dir %{krb5docdir}
 %dir /usr/lib/mit
 %dir /usr/lib/mit/sbin
@@ -458,7 +525,8 @@ rm -rf %{buildroot}/usr/lib/mit/share
 %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.acl
 %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k*
-/usr/bin/rc*
+%{_var}/adm/fillup-templates/sysconfig.*
+/usr/sbin/rc*
 /usr/lib/mit/sbin/kadmin.local
 /usr/lib/mit/sbin/kadmind
 /usr/lib/mit/sbin/kpropd
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index a1ab2df..38dad5b 100644
--- a/vendor-files.tar.bz2
+++ b/vendor-files.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f3ddbe33faa51dc418985ce06509394c23144a7eb3ddaae495f70a28203ad31a
-size 182094
+oid sha256:83ab335eb23de931f3ba4fcc855e03717e8932b88a690aa898742c6a2dca6f1c
+size 183023