diff --git a/openssl.spec b/openssl.spec
index d65c625..29703ee 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -1,4 +1,3 @@
-%define openssl_ver 1.0.2
 %define major 1.0.0
 %define engines_name %mklibname openssl-engines %{major}
 %define libcrypto %mklibname crypto %{major}
@@ -19,7 +18,7 @@
 
 %define with_krb5 %{?_with_krb5:1}%{!?_with_krb5:0}
 
-# This directory is defined in /usr/bin/openssl-config and /etc/rpm/macros.d/openssl.macros
+# This directory is defined in /usr/bin/openssl-config and %%_rpmmacrodir/*openssl*
 # during the build.
 # The purpose is a system-wide definition of this directory
 # to guarantee consistency across the whole repository.
@@ -27,8 +26,8 @@
 
 Summary:	Secure Sockets Layer communications libs & utils
 Name:		openssl
-Version:	%{openssl_ver}u
-Release:	1
+Version:	1.0.2u
+Release:	3
 License:	BSD-like
 Group:		System/Libraries
 Url:		https://www.openssl.org
@@ -172,7 +171,7 @@ and SSL.
 %{_libdir}/libssl.so
 %{_mandir}/man3/*
 %{_libdir}/pkgconfig/*
-%{_sys_macros_dir}/openssl.macros
+%{_rpmmacrodir}/*openssl*
 
 #----------------------------------------------------------------------------
 
@@ -407,11 +406,10 @@ sed -i %{buildroot}/%{_bindir}/openssl-config \
 [ "$(%{buildroot}/%{_bindir}/openssl-config --openssldir)" = '%{_openssldir}' ]
 
 # make and install openssl.macros
-install -d -m0755 %{buildroot}/%{_sys_macros_dir}
-cat %{SOURCE6} | sed -e "s#@OPENSSLDIR@#%{_openssldir}#g" > %{buildroot}/%{_sys_macros_dir}/openssl.macros
-chmod 0644 %{buildroot}/%{_sys_macros_dir}/openssl.macros
+cat %{SOURCE6} | sed -e "s#@OPENSSLDIR@#%{_openssldir}#g" > macros_file
+%install_macro openssl macros_file
 # verify openssl.macros
-grep -q '%{_openssldir}' %{buildroot}%{_sys_macros_dir}/openssl.macros
+grep -q '%{_openssldir}' %{buildroot}%{_rpmmacrodir}/*openssl*
 
 # is now built in openssl-gost-engines
 rm -fv %{buildroot}%{_libdir}/openssl-%{major}/engines/libgost.so