diff --git a/cfengine.changes b/cfengine.changes
index 93d8851..ec3745c 100644
--- a/cfengine.changes
+++ b/cfengine.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun 17 13:09:09 UTC 2015 - kkaempf@suse.com
+
+- Fix Fedora/RHEL builds
+
 -------------------------------------------------------------------
 Mon Mar 23 10:19:37 UTC 2015 - tchvatal@suse.com
 
diff --git a/cfengine.spec b/cfengine.spec
index bca3aa3..946ee10 100644
--- a/cfengine.spec
+++ b/cfengine.spec
@@ -69,7 +69,6 @@ Patch7:         cfengine-fips.patch
 Patch8:         0001-Do-not-use-insecure-MD5-but-rather-SHA256.patch
 BuildRequires:  bison
 BuildRequires:  db-devel
-BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  libacl-devel
 BuildRequires:  libtool
@@ -78,6 +77,8 @@ BuildRequires:  lmdb-devel
 BuildRequires:  openssl-devel
 BuildRequires:  pam-devel
 BuildRequires:  pcre-devel
+# for testing
+BuildRequires:  fakeroot
 Requires:       %{libsoname} = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{have_systemd}
@@ -104,13 +105,19 @@ BuildRequires:  systemd
 %else
 # Without systemd we require cron
 Requires:       cron
+%if 0%{?suse_version}
 Requires(post): %insserv_prereq %fillup_prereq
 %endif
+%endif
 # FHS was a hit with sle11 so it dies out otherwise
 %if 0%{?suse_version} <= 1110
 BuildRequires:  -post-build-checks
 %endif
 
+%if 0%{?suse_version} > 1020
+BuildRequires:  fdupes
+%endif
+
 %description
 CFEngine is the core of a configuration management system: ensuring
 the availability, security and compliance of mission-critical
@@ -245,7 +252,7 @@ ln -s -f service %{buildroot}/%{_sbindir}/rccf-execd
 ln -s -f service %{buildroot}/%{_sbindir}/rccf-serverd
 %else
 # install init scripts
-install -d %{buildroot}%{_sysconfdir}/init.d
+install -d %{buildroot}%{_initddir}
 install -m 0755 %{SOURCE7} %{SOURCE8} %{SOURCE9} %{buildroot}%{_initddir}/
 ln -s -f ../..%{_initddir}/cf-monitord %{buildroot}/%{_sbindir}/rccf-monitord
 ln -s -f ../..%{_initddir}/cf-execd %{buildroot}/%{_sbindir}/rccf-execd
@@ -281,7 +288,9 @@ done
 install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/cfengine
 
 # Ckeabyo dyoes
+%if 0%{?suse_version} > 1020
 %fdupes %{buildroot}%{_datadir}/cfengine
+%endif
 
 %pre
 %if %{have_systemd}