diff --git a/zipl/include/zipl.h b/zipl/include/zipl.h
index 8ed839ec..8a088810 100644
--- a/zipl/include/zipl.h
+++ b/zipl/include/zipl.h
@@ -21,7 +21,6 @@
 #define DISK_LAYOUT_ID			0x00000001
 
 #define ADDRESS_LIMIT			0x80000000UL
-#define ADDRESS_LIMIT_KDUMP		0x2000000UL /* HSA size: 32 MiB */
 #define UNSPECIFIED_ADDRESS		-1UL
 #define MAXIMUM_PARMLINE_SIZE		0x380UL
 #define MAXIMUM_PHYSICAL_BLOCKSIZE	0x1000UL
diff --git a/zipl/src/job.c b/zipl/src/job.c
index c3d30a08..93ccd49c 100644
--- a/zipl/src/job.c
+++ b/zipl/src/job.c
@@ -19,6 +19,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "lib/util_arch.h"
+
 #include "error.h"
 #include "job.h"
 #include "misc.h"
@@ -758,7 +760,8 @@ finalize_ipl_address_data(struct job_ipl_data* ipl, char *name)
 	int num;
 	int rc;
 
-	address_limit = ipl->is_kdump ? ADDRESS_LIMIT_KDUMP : ADDRESS_LIMIT;
+	address_limit = ipl->is_kdump ?
+		MIN(util_arch_hsa_maxsize(), ADDRESS_LIMIT) : ADDRESS_LIMIT;
 	rc = get_ipl_components(ipl, &cl, &num);
 	if (rc)
 		return rc;