diff --git a/sys/boot/pc98/boot0.5/boot.s b/sys/boot/pc98/boot0.5/boot.s
index 1a3bfc7c879..9d11206a882 100644
--- a/sys/boot/pc98/boot0.5/boot.s
+++ b/sys/boot/pc98/boot0.5/boot.s
@@ -60,7 +60,7 @@ boot:
 	movw	parttable(%si), %ax
 	movw	%ax, b_cylinder
 
-	# Step 2: Calculate egment address of bootstrap routine
+	# Step 2: Calculate the segment address of the bootstrap routine
 	movw	$0x1d00, %ax
 	movw	b_secsize, %cx
 	shrw	%cx
diff --git a/sys/boot/pc98/boot0.5/boot0.5.s b/sys/boot/pc98/boot0.5/boot0.5.s
index 80dbe2abd49..8c99ba73810 100644
--- a/sys/boot/pc98/boot0.5/boot0.5.s
+++ b/sys/boot/pc98/boot0.5/boot0.5.s
@@ -60,7 +60,7 @@ normalmode:
 	jmp	exit			# No hard drives
 
 drives_found:
-	# Setup sector size depended parameters
+	# Setup sector size dependent parameters
 	movw	%si, %cx		# %cx = number of devices
 setup_loop:
 	movw	%cx, %di
@@ -254,16 +254,9 @@ showunit:
 	ret
 
 	.data
-	.global	curdevice, daua, secsize, defflagoff, defpartoff
-	.global	maxpart, partoff, ndevice
+	.global	curdevice, ndevice
 ndevice:	.word	0		# number of device
 curdevice:	.word	0		# current device
-daua:		.space	12		# DA/DU list
-secsize:	.space	12 * 2		# Sector soize
-defflagoff:	.space	12 * 2
-defpartoff:	.space	12 * 2
-maxpart:	.space	12 * 2
-partoff:	.space	12 * 2
 
 	.global	ishireso
 ishireso:	.byte	0
@@ -288,3 +281,13 @@ msg_usage9:	.asciz	"LEGEND"
 msg_usage10:	.asciz	">>: selected device/slice"
 msg_usage11:	.asciz	"*: default slice to boot"
 msg_usage12:	.asciz	"!: unbootable slice"
+
+	.bss
+	.global	daua, secsize, defflagoff, defpartoff
+	.global	maxpart, partoff
+daua:		.space	12		# DA/DU list
+secsize:	.space	12 * 2		# Sector soize
+defflagoff:	.space	12 * 2
+defpartoff:	.space	12 * 2
+maxpart:	.space	12 * 2
+partoff:	.space	12 * 2
diff --git a/sys/boot/pc98/boot0.5/disk.s b/sys/boot/pc98/boot0.5/disk.s
index 9d0db21d925..162dce912c8 100644
--- a/sys/boot/pc98/boot0.5/disk.s
+++ b/sys/boot/pc98/boot0.5/disk.s
@@ -284,11 +284,13 @@ no_scsi_unit:
 	ret
 
 	.data
-	.global	partnum, parttable, defpartflag, defpartnum, npartition
-partnum:	.space	32		# Index of parttable
-parttable:	.space	1024		# Copy of valid partition table
+	.global	defpartflag, defpartnum, npartition
 defpartflag:	.byte	0
 defpartnum:	.byte	0
 npartition:	.word	0		# number of partitions
+
 	.bss
-iplbuf:		.space	0x400
+	.global	partnum, parttable
+iplbuf:		.space	0x400		# Read buffer for IPL
+partnum:	.space	32		# Index of parttable
+parttable:	.space	1024		# Copy of valid partition table