diff --git a/_service b/_service
index 413a4a2..be09d25 100644
--- a/_service
+++ b/_service
@@ -6,7 +6,7 @@
     <param name="exclude">.git</param>
     <param name="filename">suse-hpc</param>
     <param name="versionformat">0.5.%cd.%h</param>
-    <param name="revision">968c9cb1cc13f668529623cda4ec25af1495c7e0</param>
+    <param name="revision">87c7989e7349d543ba33aada425716f6ffcba0fb</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 678d775..5859c4b 100644
--- a/macros.hpc
+++ b/macros.hpc
@@ -741,9 +741,15 @@ sys.exit(0)" %{1}
     %define _infodir %{hpc_infodir} \
     %define _libdir %{hpc_libdir} \
     %define _libexecdir %{hpc_libexecdir} \
+    %if x%{?hpc_localstatedir} != x%{_localstatedir} \
+    %define _localstatedir %{hpc_localstatedir} \
+    %endif \
     %define _mandir %{hpc_mandir} \
     %define _prefix %{hpc_prefix} \
     %define _sbindir %{hpc_sbindir} \
+    %if x%{?hpc_sharedstatedir} != x%{_sharedstatedir} \
+    %define _sharedstatedir %{hpc_sharedstatedir} \
+    %endif \
 #Do NOT define _sysconfig to %%hpc_sysconfig here!
     %cmake \\\
     %undefine __cmake \\\
@@ -753,9 +759,15 @@ sys.exit(0)" %{1}
     %undefine _infodir \\\
     %undefine _libdir \\\
     %undefine _libexecdir \\\
+    %if x%{?hpc_localstatedir} != x%{_localstatedir} \\\
+    %undefine _localstatedir \\\
+    %endif \\\
     %undefine _mandir \\\
     %undefine _prefix \\\
     %undefine _sbindir \\\
+    %if x%{?hpc_sharedstatedir} != x%{_sharedstatedir} \\\
+    %undefine _sharedstatedir \\\
+    %endif \\\
  }
 
 # wraps macro from macros.meson - paths replaced by HPC paths.
@@ -769,11 +781,15 @@ sys.exit(0)" %{1}
     %define _infodir %{hpc_infodir} \
     %define _libdir %{hpc_libdir} \
     %define _libexecdir %{hpc_libexecdir} \
+    %if x%{?hpc_localstatedir} != x%{_localstatedir} \
     %define _localstatedir %{hpc_localstatedir} \
+    %endif \
     %define _mandir %{hpc_mandir} \
     %define _prefix %{hpc_prefix} \
     %define _sbindir %{hpc_sbindir} \
+    %if x%{?hpc_sharedstatedir} != x%{_sharedstatedir} \
     %define _sharedstatedir %{hpc_sharedstatedir} \
+    %endif \
     %define _sysconfdir %{hpc_sysconfdir} \
     %meson \\\
     %undefine __meson \\\
@@ -783,10 +799,14 @@ sys.exit(0)" %{1}
     %undefine _infodir \\\
     %undefine _libdir \\\
     %undefine _libexecdir \\\
+    %if x%{?hpc_localstatedir} != x%{_localstatedir} \\\
     %undefine _localstatedir \\\
+    %endif \\\
     %undefine _mandir \\\
     %undefine _prefix \\\
     %undefine _sbindir \\\
+    %if x%{?hpc_sharedstatedir} != x%{_sharedstatedir} \\\
     %undefine _sharedstatedir \\\
+    %endif \\\
     %undefine _sysconfdir \\\
  }
diff --git a/suse-hpc.changes b/suse-hpc.changes
index 5da1488..021df92 100644
--- a/suse-hpc.changes
+++ b/suse-hpc.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Oct 24 09:09:47 UTC 2023 - Egbert Eich <eich@suse.com>
+
+- Handle %hpc_localstatedir and %hpc_sharedstatedir only when
+  changed from %_localstatedir and %_sharedstatedir to avoid
+  infinite recursion.
+
 -------------------------------------------------------------------
 Mon May  1 07:43:38 UTC 2023 - Egbert Eich <eich@suse.com>
 
diff --git a/suse-hpc.spec b/suse-hpc.spec
index f1aeeb5..51f737b 100644
--- a/suse-hpc.spec
+++ b/suse-hpc.spec
@@ -20,7 +20,7 @@ Summary:        SUSE HPC Environment
 License:        BSD-3-Clause
 Group:          Productivity/Clustering/Computing
 Name:           suse-hpc
-Version:        0.5.20230501.968c9cb
+Version:        0.5.20231024.0226cb7
 Release:        0
 Source0:        macros.hpc
 Source1:        dlinfo.c