diff --git a/opensm.service b/opensm.service
index 1658e04..1a64a83 100644
--- a/opensm.service
+++ b/opensm.service
@@ -3,7 +3,7 @@ Description=Starts the OpenSM InfiniBand fabric Subnet Manager
 Documentation=man:opensm
 DefaultDependencies=false
 Before=network.target remote-fs-pre.target
-After=rdma-load-modules@.service
+After=rdma-hw.target
 
 [Service]
 Type=forking
diff --git a/opensm.spec b/opensm.spec
index 25668e5..8873ed0 100644
--- a/opensm.spec
+++ b/opensm.spec
@@ -2,7 +2,7 @@
 
 Name:    opensm
 Version: 3.3.23
-Release: 3%{?dist}
+Release: 5%{?dist}
 Summary: OpenIB InfiniBand Subnet Manager and management utilities
 License: GPLv2 or BSD
 Url:     https://github.com/linux-rdma/opensm
@@ -63,12 +63,12 @@ Static version of opensm libraries
 ./autogen.sh
 %endif
 %configure --with-opensm-conf-sub-dir=rdma
-make %{?_smp_mflags}
+%make_build
 cd opensm
 ./opensm -c ../opensm-%{version}.conf
 
 %install
-make install DESTDIR=%{buildroot}
+%make_install
 # remove unpackaged files from the buildroot
 rm -f %{buildroot}%{_libdir}/*.la
 rm -fr %{buildroot}%{_sysconfdir}/init.d
@@ -120,6 +120,13 @@ fi
 %{_libdir}/lib*.a
 
 %changelog
+* Thu Dec 10 2020 Timm Bäder <tbaeder@redhat.com> 3.3.23.5
+- Use make macros
+  https://docs.fedoraproject.org/en-US/packaging-guidelines/#_parallel_make
+
+* Thu Dec 10 2020 Honggang Li <honli@redhat.com> - 3.3.23-4
+- opensm service should after rdma-hw.target
+
 * Thu Oct 29 2020 Honggang Li <honli@redhat.com> -3.3.23-3
 - Update systemd service file