diff --git a/include/boot/linux_layout.h b/include/boot/linux_layout.h
index 92d2f281..83f91a21 100644
--- a/include/boot/linux_layout.h
+++ b/include/boot/linux_layout.h
@@ -17,6 +17,7 @@
 #define IMAGE_ENTRY_KDUMP	_AC(0x10010, UL)
 
 /* Parameter address offsets */
+#define PARMAREA		_AC(0x10400, UL)
 #define IPL_DEVICE		_AC(0x10400, UL)
 #define INITRD_START		_AC(0x10408, UL)
 #define INITRD_SIZE		_AC(0x10410, UL)
diff --git a/zipl/boot/tape0.S b/zipl/boot/tape0.S
index e2a659d2..9898f0c1 100644
--- a/zipl/boot/tape0.S
+++ b/zipl/boot/tape0.S
@@ -8,29 +8,21 @@
 #
 
 #include "boot/sigp.h"
+#include "boot/linux_layout.h"
 
 IPL_BS			= 1024			# block size for tape access
 IPL_OFF			= 0x4000		# temporary kernel load addr
-COMMAND_LINE_SIZE	= 896			# max command line length
-KERNEL_OFF		= 0x10000		# kernel start code offset
+KERNEL_OFF		= IMAGE_ENTRY		# kernel start code offset
 						# relative to image start
 __LC_IO_NEW_PSW         = 0x1f0			# IO New PSW addr
 
 
-# Parameter address offsets
-
-PARMAREA		= 0x10400		# Parameter area offset
-IPL_DEVICE		= 0x10400		# IPL device offset
-INITRD_START		= 0x10408		# ramdisk addr offset
-INITRD_SIZE		= 0x10410		# ramdisk size offset
-COMMAND_LINE		= 0x10480		# command line offset
-
 # Default IPL parameter - will be overwritten by zIPL
 
 RAMDISK_ORIGIN		= 0x800000		# default ramdisk load addr
 RAMDISK_SIZE		= 0x800000		# default ramdisk size
 PARMFILE_ADDR		= 0x1000		# default parmfile load addr
-KERNEL_ADDR		= 0x10000		# default kernel load addr
+KERNEL_ADDR		= IMAGE_ENTRY		# default kernel load addr
 
 
 	.org 0x0