diff --git a/sssd.spec b/sssd.spec
index 9d888e8..0caefe4 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           sssd
 Version:        1.8.2
 Release:        0
@@ -22,18 +23,14 @@ Summary:        System Security Services Daemon
 License:        GPL-3.0+ and LGPL-3.0+
 Group:          System/Daemons
 Url:            https://fedorahosted.org/sssd/
+
 Source0:        %{name}-%{version}.tar.gz
-#removed bz2
 Source1:        baselibs.conf
 Patch3:         0003-Allow-LDAP-to-decide-when-an-expiration-warning-is-w.patch
 Patch4:         0004-avoid-hard-crypto-dep.diff
 Patch5:         0005-implicit-decl.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
-%if %suse_version >= 1210
-%{?systemd_requires}
-%endif
-
 %define servicename sssd
 %define sssdstatedir %{_localstatedir}/lib/sss
 %define dbpath %{sssdstatedir}/db
@@ -98,6 +95,7 @@ BuildRequires:  pam-devel
 BuildRequires:  pkg-config
 %if %suse_version >= 1210
 BuildRequires:  systemd
+%{?systemd_requires}
 %endif
 
 %description
@@ -195,12 +193,10 @@ export PATH="$PATH:/usr/sbin"
     --with-selinux=no \
     --with-os=suse \
 %if 0%{?sles_version} == 11
-    --with-semanage=no \
     --with-unicode-lib=glib2
-%else
-    --with-semanage=no
 %endif
-    
+    --with-semanage=no
+
 make %{?_smp_mflags} all
 
 %install
@@ -220,7 +216,7 @@ install -d %{buildroot}%{_mandir}/uk/man8
 install -d $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
 install -m600 src/examples/sssd-example.conf $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
 install src/sysv/SUSE/sssd $RPM_BUILD_ROOT%{_sysconfdir}/init.d/sssd
-%if %suse_version >= 1210
+%if 0%{?_unitdir:1}
 install -d $RPM_BUILD_ROOT/%{_unitdir}
 install src/sysv/systemd/sssd.service $RPM_BUILD_ROOT/%{_unitdir}/sssd.service
 %endif
@@ -242,21 +238,20 @@ rm -rf \
 
 %find_lang %{name} --all-name
 
-%if %suse_version >= 1210
-
+%if 0%{?_unitdir:1}
 %pre
 %service_add_pre sssd.service
 %endif
 
 %post
 /sbin/ldconfig
-%if %suse_version >= 1210
+%if 0%{?_unitdir:1}
 %service_add_post sssd.service
 %endif
 
 %preun
 %stop_on_removal sssd
-%if %suse_version >= 1210
+%if 0%{?_unitdir:1}
 %service_del_preun sssd.service
 %endif
 
@@ -264,7 +259,7 @@ rm -rf \
 /sbin/ldconfig
 %restart_on_update sssd
 %insserv_cleanup
-%if %suse_version >= 1210
+%if 0%{?_unitdir:1}
 %service_del_postun sssd.service
 %endif
 
@@ -276,7 +271,7 @@ rm -rf \
 %defattr(-,root,root,-)
 %doc COPYING
 %{_initrddir}/%{name}
-%if %suse_version >= 1210
+%if 0%{?_unitdir:1}
 %{_unitdir}/sssd.service
 %endif
 %{_sbindir}/sssd