diff --git a/_service b/_service
index 9d340dd..68e0786 100644
--- a/_service
+++ b/_service
@@ -6,7 +6,7 @@
     <param name="exclude">.git</param>
     <param name="filename">suse-hpc</param>
     <param name="versionformat">0.4.%h</param>
-    <param name="revision">d55686f0e90750122e3a56f4a38e3cb05a02381c</param>
+    <param name="revision">663bf86ed7dc0d3e5526d4b7c7edaf5d04de648f</param>
 	<param name="extract">general/dlinfo.c</param>
 	<param name="extract">general/macros.hpc</param>
 	<param name="extract">general/hpc_elf.pl</param>
diff --git a/macros.hpc b/macros.hpc
index 2fcbfa7..6a779e7 100644
--- a/macros.hpc
+++ b/macros.hpc
@@ -117,6 +117,7 @@ EOF\
 # -V: <arg>: set MPI version to <arg> (optional - default:)
 # -e: <arg>: program name extension
 %_hpc_init(Cc:Mm:v:V:e:)\
+  %global hpc_base %{expand:%hpc_base} \
   %{-m:%{!-c:%{error: Cannot est MPI family without compiler}}} \
   %{-c:%{expand: %%global hpc_compiler_family %{-c*}}} \
   %{-m: %{expand: %%global hpc_mpi_family %{-m*}}} \
diff --git a/suse-hpc.changes b/suse-hpc.changes
index d7968c0..90d7ead 100644
--- a/suse-hpc.changes
+++ b/suse-hpc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jul 23 17:42:34 UTC 2020 - Egbert Eich <eich@suse.com>
+
+- Fix %%hpc_base during hpc_init to allow for changes to %%_prefix.
+
 -------------------------------------------------------------------
 Thu May  7 21:50:13 UTC 2020 - Egbert Eich <eich@suse.com>