diff --git a/scripts/dumpconf b/scripts/dumpconf
index a8ba9202..f1c54714 100755
--- a/scripts/dumpconf
+++ b/scripts/dumpconf
@@ -224,7 +224,7 @@ setup_ccw_device()
 {
 	DEV="$(CheckDeviceString $DEVICE)"
 	if [ "$DEV" != "" ]; then
-		echo $DEV > $1/$2/device
+		echo $DEV > $1/ccw/device
 	else
 		RETVAL=1
 		pr_error "ERROR: Invalid DEVICE '$DEVICE'." $ERRMSG
@@ -232,11 +232,33 @@ setup_ccw_device()
 	fi
 }
 
+setup_eckd_device()
+{
+	DEV="$(CheckDeviceString $DEVICE)"
+	if [ "$DEV" != "" ]; then
+		echo $DEV > $1/eckd/device
+	else
+		RETVAL=1
+		pr_error "ERROR: Invalid DEVICE '$DEVICE'." $ERRMSG
+		return
+	fi
+	echo $BOOTPROG > $1/eckd/bootprog 2>/dev/null || RETVAL=1
+	if [ $RETVAL -eq 1 ]; then
+		pr_error "ERROR: Invalid BOOTPROG '$BOOTPROG'." $ERRMSG
+		return
+	fi
+	echo $BR_CHR > $1/eckd/br_chr 2>/dev/null || RETVAL=1
+	if [ $RETVAL -eq 1 ]; then
+		pr_error "ERROR: Invalid BR_CHR '$BR_CHR'." $ERRMSG
+		return
+	fi
+}
+
 setup_fcp_device()
 {
 	DEV="$(CheckDeviceString $DEVICE)"
 	if [ "$DEV" != "" ]; then
-		echo $DEV > $1/$2/device
+		echo $DEV > $1/fcp/device
 	else
 		RETVAL=1
 		pr_error "ERROR: Invalid DEVICE '$DEVICE'." $ERRMSG
@@ -302,13 +324,13 @@ setup_reipl()
 
 	case "$REIPL_TYPE" in
 		eckd)
-			setup_ccw_device $REIPL_CONFIG_DIR $REIPL_TYPE
+			setup_eckd_device $REIPL_CONFIG_DIR
 			;;
 		ccw)
-			setup_ccw_device $REIPL_CONFIG_DIR $REIPL_TYPE
+			setup_ccw_device $REIPL_CONFIG_DIR
 			;;
 		fcp)
-			setup_fcp_device $REIPL_CONFIG_DIR $REIPL_TYPE
+			setup_fcp_device $REIPL_CONFIG_DIR
 			;;
 		nvme)
 			setup_nvme_device $REIPL_CONFIG_DIR
@@ -336,13 +358,13 @@ setup_dump()
 {
 	case "$DUMP_TYPE" in
 		eckd)
-			setup_ccw_device $DUMP_CONFIG_DIR $DUMP_TYPE
+			setup_eckd_device $DUMP_CONFIG_DIR
 			;;
 		ccw)
-			setup_ccw_device $DUMP_CONFIG_DIR $DUMP_TYPE
+			setup_ccw_device $DUMP_CONFIG_DIR
 			;;
 		fcp)
-			setup_fcp_device $DUMP_CONFIG_DIR $DUMP_TYPE
+			setup_fcp_device $DUMP_CONFIG_DIR
 			;;
 		nvme)
 			setup_nvme_device $DUMP_CONFIG_DIR