diff --git a/mcelog.service b/mcelog.service
index 1148239..abbdaa2 100644
--- a/mcelog.service
+++ b/mcelog.service
@@ -1,14 +1,7 @@
 [Unit]
 Description=Machine Check Exception Logging Daemon
 
-# FIXME - due to upstream kernel bug always start the mcelog process
-# twice using the following ExecStartPre hack. This needs fixing.
-# There is a bug filed against systemd for the ExecStartPre bit
-# since it is not possible to specify that the ExecStarPre bit
-# is allowed and expected to fail without aborting the daemon.
-
 [Service]
-ExecStartPre=/etc/mcelog/mcelog.setup
 ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground
 
 [Install]
diff --git a/mcelog.spec b/mcelog.spec
index d126a7b..e671929 100644
--- a/mcelog.spec
+++ b/mcelog.spec
@@ -12,7 +12,6 @@ Source0:	%{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 # note that this source OVERRIDES the one on the tarball above!
 Source1:	mcelog.conf
 Source2:	mcelog.service
-Source10:	mcelog.setup
 ExclusiveArch:	i686 x86_64
 Requires(post): systemd
 Requires(preun): systemd
@@ -37,7 +36,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
 install -p -m755 mcelog $RPM_BUILD_ROOT/%{_sbindir}/mcelog
 install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog/mcelog.conf
-install -p -m755 %{SOURCE10} $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog/mcelog.setup
 install -p -m755 triggers/cache-error-trigger $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog/triggers/cache-error-trigger
 install -p -m755 triggers/dimm-error-trigger $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog/triggers/dimm-error-trigger
 install -p -m755 triggers/page-error-trigger $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog/triggers/page-error-trigger
@@ -61,7 +59,6 @@ install -p -m644 mcelog*.5 $RPM_BUILD_ROOT/%{_mandir}/man5/
 %dir %{_sysconfdir}/mcelog
 %{_sysconfdir}/mcelog/triggers
 %config(noreplace) %{_sysconfdir}/mcelog/mcelog.conf
-%{_sysconfdir}/mcelog/mcelog.setup
 %{_unitdir}/mcelog.service
 %{_mandir}/*/*
 
@@ -69,6 +66,7 @@ install -p -m644 mcelog*.5 $RPM_BUILD_ROOT/%{_mandir}/man5/
 * Wed Jan 27 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3:119-1
 - Update to latest upstream tag
 - Drop cron job (#1066659)
+- Remove double starting of daemon
 
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3:101-2.9bfaad8f92c5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild