diff --git a/chrony.spec b/chrony.spec
index 9faab33..02f1458 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -10,6 +10,7 @@ URL:            http://chrony.tuxfamily.org
 Source0:        http://download.tuxfamily.org/chrony/chrony-%{version}%{?prerelease}.tar.gz
 Source1:        chrony.conf
 Source2:        chrony.keys
+Source3:        chronyd.service
 Source4:        chronyd.init
 Source5:        chrony.logrotate
 # wget -O timepps.h 'http://gitweb.enneenne.com/?p=linuxpps;a=blob_plain;f=Documentation/pps/timepps.h;hb=b895b1a28558b83907c691aad231c41a0d14df88'
@@ -65,9 +66,11 @@ mkdir -p $RPM_BUILD_ROOT{%{_sysconfdir}/{sysconfig,logrotate.d},%{_initrddir}}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/{lib,log}/chrony
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dhcp/dhclient.d
+mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
 
 install -m 644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/chrony.conf
 install -m 640 -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/chrony.keys
+install -m 644 -p %{SOURCE3} $RPM_BUILD_ROOT/lib/systemd/system/chronyd.service
 install -m 755 -p %{SOURCE4} $RPM_BUILD_ROOT%{_initrddir}/chronyd
 install -m 644 -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/chrony
 install -m 755 -p %{SOURCE7} \
@@ -88,6 +91,9 @@ getent passwd chrony > /dev/null || /usr/sbin/useradd -r -g chrony \
 
 %post
 /sbin/chkconfig --add chronyd
+/sbin/chkconfig chronyd &> /dev/null &&
+        /bin/systemctl enable chronyd.service &> /dev/null ||
+        /bin/systemctl daemon-reload &> /dev/null
 /sbin/install-info  %{_infodir}/chrony.info.gz %{_infodir}/dir
 :
 
@@ -95,6 +101,7 @@ getent passwd chrony > /dev/null || /usr/sbin/useradd -r -g chrony \
 if [ "$1" -eq 0 ]; then
         /sbin/service chronyd stop &> /dev/null
         /sbin/chkconfig --del chronyd
+        /bin/systemctl disable chronyd.service &> /dev/null
         /sbin/install-info --delete %{_infodir}/chrony.info.gz %{_infodir}/dir
 fi
 :
@@ -117,6 +124,7 @@ fi
 %{_bindir}/chronyc
 %{_sbindir}/chronyd
 %{_infodir}/chrony.info*
+/lib/systemd/system/chronyd.service
 %{_mandir}/man[158]/%{name}*.[158]*
 %dir %attr(-,chrony,chrony) %{_localstatedir}/lib/chrony
 %ghost %attr(-,chrony,chrony) %{_localstatedir}/lib/chrony/drift
diff --git a/chronyd.init b/chronyd.init
index 3f0b5f1..e78942e 100644
--- a/chronyd.init
+++ b/chronyd.init
@@ -153,6 +153,12 @@ case "$1" in
         rh_status_q || exit 7
         chrony_command $1
         ;;
+    generate-commandkey)
+        generate_commandkey
+        ;;
+    add-dhclient-servers)
+        add_dhclient_servers
+        ;;
     command)
         rh_status_q || exit 7
         chrony_command "$2"
diff --git a/chronyd.service b/chronyd.service
new file mode 100644
index 0000000..fd34b09
--- /dev/null
+++ b/chronyd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=NTP client/server
+After=syslog.target ntpdate.service
+Conflicts=ntpd.service
+
+[Service]
+ExecStartPre=/etc/init.d/chronyd generate-commandkey
+ExecStart=/usr/sbin/chronyd -n -u chrony
+ExecStartPost=/etc/init.d/chronyd add-dhclient-servers
+
+[Install]
+WantedBy=multi-user.target