diff --git a/rpm.macros b/rpm.macros
index cc598d6..a6e8e7c 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -21,12 +21,13 @@
 %_selinux_policy_version SELINUXPOLICYVERSION
 
 %_selinux_store_path SELINUXSTOREPATH
+%_selinux_store_policy_path %{_selinux_store_path}/${_policytype}
 
 %_file_context_file %{_sysconfdir}/selinux/${SELINUXTYPE}/contexts/files/file_contexts
 %_file_context_file_pre %{_localstatedir}/lib/rpm-state/file_contexts.pre
 
-%_file_custom_defined_booleans %{_selinux_store_path}/${_policytype}/rpmbooleans.custom
-%_file_custom_defined_booleans_tmp %{_selinux_store_path}/${_policytype}/rpmbooleans.custom.tmp
+%_file_custom_defined_booleans %{_selinux_store_policy_path}/rpmbooleans.custom
+%_file_custom_defined_booleans_tmp %{_selinux_store_policy_path}/rpmbooleans.custom.tmp
 
 # %selinux_requires
 %selinux_requires \
@@ -38,7 +39,7 @@ BuildRequires: selinux-policy-devel \
 Requires(post): selinux-policy-base >= %{_selinux_policy_version} \
 Requires(post): libselinux-utils \
 Requires(post): policycoreutils \
-%if 0%{?fedora} \
+%if 0%{?fedora} || 0%{?rhel} > 7\
 Requires(post): policycoreutils-python-utils \
 %else \
 Requires(post): policycoreutils-python \
@@ -52,9 +53,9 @@ _policytype=%{-s*} \
 if [ -z "${_policytype}" ]; then \
   _policytype="targeted" \
 fi \
-%{_sbindir}/semodule -n -s ${_policytype} -X %{!-p:200}%{-p*} -i %* \
-if %{_sbindir}/selinuxenabled && [ "${SELINUXTYPE}" = "${_policytype}" ]; then \
-  %{_sbindir}/load_policy \
+if [ "${SELINUXTYPE}" = "${_policytype}" ]; then \
+  %{_sbindir}/semodule -n -s ${_policytype} -X %{!-p:200}%{-p*} -i %* \
+  %{_sbindir}/selinuxenabled && %{_sbindir}/load_policy \
 fi \
 %{nil}
 
@@ -66,9 +67,9 @@ if [ -z "${_policytype}" ]; then \
   _policytype="targeted" \
 fi \
 if [ $1 -eq 0 ]; then \
-  %{_sbindir}/semodule -n -X %{!-p:200}%{-p*} -s ${_policytype} -r %* &> /dev/null || : \
-  if %{_sbindir}/selinuxenabled && [ "${SELINUXTYPE}" = "${_policytype}" ]; then \
-    %{_sbindir}/load_policy \
+  if [ "${SELINUXTYPE}" = "${_policytype}" ]; then \
+    %{_sbindir}/semodule -n -X %{!-p:200}%{-p*} -s ${_policytype} -r %* &> /dev/null || : \
+    %{_sbindir}/selinuxenabled && %{_sbindir}/load_policy \
   fi \
 fi \
 %{nil}
@@ -108,33 +109,35 @@ _policytype=%{-s*} \
 if [ -z "${_policytype}" ]; then \
   _policytype="targeted" \
 fi \
-LOCAL_MODIFICATIONS=$(semanage boolean -E) \
-if [ ! -f %_file_custom_defined_booleans ]; then \
-    /bin/echo "# This file is managed by macros.selinux-policy. Do not edit it manually" > %_file_custom_defined_booleans \
-fi \
-semanage_import='' \
-for boolean in %*; do \
-    boolean_name=${boolean%=*} \
-    boolean_value=${boolean#*=} \
-    boolean_local_string=$(grep "$boolean_name\$" <<<$LOCAL_MODIFICATIONS) \
-    if [ -n "$boolean_local_string" ]; then \
-        semanage_import="${semanage_import}\\nboolean -m -$boolean_value $boolean_name" \
-        boolean_customized_string=$(grep "$boolean_name\$" %_file_custom_defined_booleans | tail -n 1) \
-        if [ -n "$boolean_customized_string" ]; then \
-            /bin/echo $boolean_customized_string >> %_file_custom_defined_booleans \
-        else \
-            /bin/echo $boolean_local_string >> %_file_custom_defined_booleans \
-        fi \
-    else \
-        semanage_import="${semanage_import}\\nboolean -m -$boolean_value $boolean_name" \
-        boolean_default_value=$(semanage boolean -l | grep "^$boolean_name " | sed 's/[^(]*([^,]*, *\\(on\\|off\\).*/\\1/') \
-        /bin/echo "boolean -m --$boolean_default_value $boolean_name" >> %_file_custom_defined_booleans \
-    fi \
-done; \
-if %{_sbindir}/selinuxenabled && [ "${SELINUXTYPE}" = "${_policytype}" ]; then \
-    /bin/echo -e "$semanage_import" | %{_sbindir}/semanage import -S "${_policytype}" \
-else \
-    /bin/echo -e "$semanage_import" | %{_sbindir}/semanage import -S "${_policytype} -N" \
+if [ -d "%{_selinux_store_policy_path}" ]; then \
+  LOCAL_MODIFICATIONS=$(%{_sbindir}/semanage boolean -E) \
+  if [ ! -f %_file_custom_defined_booleans ]; then \
+      /bin/echo "# This file is managed by macros.selinux-policy. Do not edit it manually" > %_file_custom_defined_booleans \
+  fi \
+  semanage_import='' \
+  for boolean in %*; do \
+      boolean_name=${boolean%=*} \
+      boolean_value=${boolean#*=} \
+      boolean_local_string=$(grep "$boolean_name\$" <<<$LOCAL_MODIFICATIONS) \
+      if [ -n "$boolean_local_string" ]; then \
+          semanage_import="${semanage_import}\\nboolean -m -$boolean_value $boolean_name" \
+          boolean_customized_string=$(grep "$boolean_name\$" %_file_custom_defined_booleans | tail -n 1) \
+          if [ -n "$boolean_customized_string" ]; then \
+              /bin/echo $boolean_customized_string >> %_file_custom_defined_booleans \
+          else \
+              /bin/echo $boolean_local_string >> %_file_custom_defined_booleans \
+          fi \
+      else \
+          semanage_import="${semanage_import}\\nboolean -m -$boolean_value $boolean_name" \
+          boolean_default_value=$(LC_ALL=C %{_sbindir}/semanage boolean -l | grep "^$boolean_name " | sed 's/[^(]*([^,]*, *\\(on\\|off\\).*/\\1/') \
+          /bin/echo "boolean -m --$boolean_default_value $boolean_name" >> %_file_custom_defined_booleans \
+      fi \
+  done; \
+  if %{_sbindir}/selinuxenabled && [ "${SELINUXTYPE}" = "${_policytype}" ]; then \
+      /bin/echo -e "$semanage_import" | %{_sbindir}/semanage import -S "${_policytype}" \
+  elif test -d /usr/share/selinux/"${_policytype}"/base.lst; then \
+      /bin/echo -e "$semanage_import" | %{_sbindir}/semanage import -S "${_policytype}" -N \
+  fi \
 fi \
 %{nil}
 
@@ -145,20 +148,22 @@ _policytype=%{-s*} \
 if [ -z "${_policytype}" ]; then \
   _policytype="targeted" \
 fi \
-semanage_import='' \
-for boolean in %*; do \
-    boolean_name=${boolean%=*} \
-    boolean_customized_string=$(grep "$boolean_name\$" %_file_custom_defined_booleans | tail -n 1) \
-    if [ -n "$boolean_customized_string" ]; then \
-        awk "/$boolean_customized_string/ && !f{f=1; next} 1" %_file_custom_defined_booleans > %_file_custom_defined_booleans_tmp && mv %_file_custom_defined_booleans_tmp %_file_custom_defined_booleans \
-        if ! grep -q "$boolean_name\$" %_file_custom_defined_booleans; then \
-            semanage_import="${semanage_import}\\n${boolean_customized_string}" \
-        fi \
-    fi \
-done; \
-if %{_sbindir}/selinuxenabled && [ "${SELINUXTYPE}" = "${_policytype}" ]; then \
-    /bin/echo -e "$semanage_import" | %{_sbindir}/semanage import -S "${_policytype}" \
-else \
-    /bin/echo -e "$semanage_import" | %{_sbindir}/semanage import -S "${_policytype} -N" \
+if [ -d "%{_selinux_store_policy_path}" ]; then \
+  semanage_import='' \
+  for boolean in %*; do \
+      boolean_name=${boolean%=*} \
+      boolean_customized_string=$(grep "$boolean_name\$" %_file_custom_defined_booleans | tail -n 1) \
+      if [ -n "$boolean_customized_string" ]; then \
+          awk "/$boolean_customized_string/ && !f{f=1; next} 1" %_file_custom_defined_booleans > %_file_custom_defined_booleans_tmp && mv %_file_custom_defined_booleans_tmp %_file_custom_defined_booleans \
+          if ! grep -q "$boolean_name\$" %_file_custom_defined_booleans; then \
+              semanage_import="${semanage_import}\\n${boolean_customized_string}" \
+          fi \
+      fi \
+  done; \
+  if %{_sbindir}/selinuxenabled && [ "${SELINUXTYPE}" = "${_policytype}" ]; then \
+      /bin/echo -e "$semanage_import" | %{_sbindir}/semanage import -S "${_policytype}" \
+  elif test -d /usr/share/selinux/"${_policytype}"/base.lst; then \
+      /bin/echo -e "$semanage_import" | %{_sbindir}/semanage import -S "${_policytype}" -N \
+  fi \
 fi \
 %{nil}
diff --git a/selinux-policy.spec b/selinux-policy.spec
index b54b035..6f13a05 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -29,7 +29,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.14.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
@@ -709,6 +709,9 @@ exit 0
 %endif
 
 %changelog
+* Sat Oct 13 2018 Lukas Vrabec <lvrabec@redhat.com> - 3.14.3-7
+- Update rpm macros for selinux policy from sources repository: https://github.com/fedora-selinux/selinux-policy-macros
+
 * Tue Oct 09 2018 Lukas Vrabec <lvrabec@redhat.com> - 3.14.3-6
 - Allow boltd_t to be activated by init socket activation
 - Allow virt_domain to read/write to virtd_t unix_stream socket because of new version of libvirt 4.4. BZ(1635803)