diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index e3656f0ca88..997a2fd7514 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -62,7 +62,9 @@ options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	PFIL_HOOKS		# pfil(9) framework
 
 # Debugging for use in -current
-options 	DDB			# Enable the kernel debugger
+options 	KDB			# Enable kernel debugger support.
+options 	DDB			# Support DDB.
+options 	GDB			# Support remote GDB.
 options 	INVARIANTS		# Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
 options 	WITNESS			# Enable checks to detect deadlocks and cycles