diff --git a/ptpd.changes b/ptpd.changes
index b231df2..e57a718 100644
--- a/ptpd.changes
+++ b/ptpd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 25 08:08:17 UTC 2018 - mpluskal@suse.com
+
+- Use correct executable path in service file (bsc#1076900)
+
 -------------------------------------------------------------------
 Thu Nov 23 13:47:12 UTC 2017 - rbrown@suse.com
 
diff --git a/ptpd.spec b/ptpd.spec
index 0c62d6e..6054f1f 100644
--- a/ptpd.spec
+++ b/ptpd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ptpd
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,16 +18,15 @@
 
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
-  %define _fillupdir /var/adm/fillup-templates
+  %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
-
 Name:           ptpd
 Version:        2.3.1
 Release:        0
 Summary:        Implements the Precision Time protocol as defined by IEEE 1588 standard
 License:        BSD-3-Clause
 Group:          System/Daemons
-Url:            https://github.com/ptpd/ptpd
+URL:            https://github.com/ptpd/ptpd
 Source0:        https://github.com/ptpd/ptpd/archive/ptpd-%{version}.tar.gz
 Source1:        ptpd2.service
 Source2:        ptpd2.conf
@@ -42,7 +41,6 @@ BuildRequires:  net-snmp-devel
 BuildRequires:  openssl-devel
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  zlib-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}
 
 %description
@@ -97,7 +95,6 @@ touch %{buildroot}%{_localstatedir}/log/ptpd2_kernelclock.drift
 %service_del_postun %{name}2.service
 
 %files
-%defattr(-, root, root)
 %doc COPYRIGHT ChangeLog README
 %config %{_sysconfdir}/%{name}2.conf
 %{_sbindir}/ptpd2
diff --git a/ptpd2.service b/ptpd2.service
new file mode 100644
index 0000000..2a112e1
--- /dev/null
+++ b/ptpd2.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=ptpd time precision daemon
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/sysconfig/ptpd2
+ExecStart=/usr/sbin/ptpd2 -c $PTPD_CONFIG_FILE $PTPD_EXTRA_OPTIONS
+
+[Install]
+WantedBy=multi-user.target