diff --git a/openblas.changes b/openblas.changes
index ef46e61..327ad14 100644
--- a/openblas.changes
+++ b/openblas.changes
@@ -1,9 +1,13 @@
 -------------------------------------------------------------------
 Mon Jul 29 09:21:41 UTC 2024 - Egbert Eich <eich@suse.com>
 
-- Make sure the minimum CPU requirement set in the pkgconfig
-  file is the same one as used for building. This also helps
-  to maintain a reproducible build (boo#1228177).
+- Duplicate all options passed to `make` also to `make install`:
+  The openblas build output suggests this: 'Note that any flags
+  passed to make during build should also be passed to make install
+  to circumvent any install errors'.
+  This also makes sure that minimum CPU requirement is set in
+  the pkgconfig file is the same one as used for building.
+  This helps to maintain a reproducible build (boo#1228177).
 
 -------------------------------------------------------------------
 Thu Jun 13 07:32:23 UTC 2024 - Andreas Schwab <schwab@suse.de>
diff --git a/openblas.spec b/openblas.spec
index bc6aa48..5d48711 100644
--- a/openblas.spec
+++ b/openblas.spec
@@ -445,13 +445,15 @@ make MAKE_NB_JOBS=$jobs %{?openblas_target} %{?build_flags} \
 # Install library and headers
 # Pass NUM_THREADS again, as it is not propagated from the build step
 # https://github.com/OpenMathLib/OpenBLAS/issues/4275
-%make_install  %{?build_flags} \
-    %{?openblas_target} \
+%make_install  %{?openblas_target} %{?build_flags} \
+    %{?openblas_opt} \
     NUM_THREADS=%{num_threads} \
     OPENBLAS_LIBRARY_DIR=%{p_libdir} \
     OPENBLAS_INCLUDE_DIR=%{p_includedir} \
     OPENBLAS_CMAKE_DIR=%{p_cmakedir} \
-    %{?libnamesuffix} \
+    %{!?with_hpc:%{?libnamesuffix} FC=gfortran CC=gcc%{?cc_v:-%{cc_v}} %{?cc_v:CEXTRALIB=""}} \
+    %{?ldflags_tests:LDFLAGS_TESTS=%{ldflags_tests}} \
+    %{?with_hpc:%{?cc_v:CC=gcc-%{cc_v} FC=gfortran-%{cc_v} CEXTRALIB=""}} \
     PREFIX=%{p_prefix}
 
 # Delete info about OBS host cpu