diff --git a/sys/modules/ugen/Makefile b/sys/modules/ugen/Makefile
index ae357b86219..787d9ca7faa 100644
--- a/sys/modules/ugen/Makefile
+++ b/sys/modules/ugen/Makefile
@@ -7,7 +7,7 @@ SOURCE		 = ${.CURDIR}/../../dev/usb
 KMOD		 = ugen_mod
 SRCS		 = bus_if.h device_if.h vnode_if.h opt_usb.h ugen.c
 NOMAN		 =
-CFLAGS		+= -g -O
+CFLAGS		+= -g
 CLEANFILES	+= bus_if.h device_if.h vnode_if.h opt_usb.h \
 		   vnode_if.c
 
diff --git a/sys/modules/uhid/Makefile b/sys/modules/uhid/Makefile
index 829a214d365..c8235117d7e 100644
--- a/sys/modules/uhid/Makefile
+++ b/sys/modules/uhid/Makefile
@@ -7,7 +7,7 @@ SOURCE		 = ${.CURDIR}/../../dev/usb
 KMOD		 = uhid_mod
 SRCS		 = bus_if.h device_if.h vnode_if.h opt_usb.h uhid.c
 NOMAN		 =
-CFLAGS		+= -g -O
+CFLAGS		+= -g
 CLEANFILES	+= bus_if.h device_if.h vnode_if.h opt_usb.h \
 		   vnode_if.c
 
diff --git a/sys/modules/ukbd/Makefile b/sys/modules/ukbd/Makefile
index 9d248a6fd18..7871080835b 100644
--- a/sys/modules/ukbd/Makefile
+++ b/sys/modules/ukbd/Makefile
@@ -9,7 +9,7 @@ SRCS		 = bus_if.h device_if.h vnode_if.h \
 		   opt_usb.h ukbd.h opt_kbd.h \
 		   ukbd.c
 NOMAN		 =
-CFLAGS		+= -g -O
+CFLAGS		+= -g
 CLEANFILES	+= bus_if.h device_if.h vnode_if.h \
 		   opt_usb.h ukbd.h opt_kbd.h \
 		   vnode_if.c
diff --git a/sys/modules/ulpt/Makefile b/sys/modules/ulpt/Makefile
index 0a3fc7467ba..c903780e5d1 100644
--- a/sys/modules/ulpt/Makefile
+++ b/sys/modules/ulpt/Makefile
@@ -7,7 +7,7 @@ SOURCE		 = ${.CURDIR}/../../dev/usb
 KMOD		 = ulpt_mod
 SRCS		 = bus_if.h device_if.h vnode_if.h opt_usb.h ulpt.c
 NOMAN		 =
-CFLAGS		+= -g -O
+CFLAGS		+= -g
 CLEANFILES	+= bus_if.h device_if.h vnode_if.h opt_usb.h \
 		   vnode_if.c
 
diff --git a/sys/modules/umass/Makefile b/sys/modules/umass/Makefile
index 3d7a81f1adb..1fb09e1671f 100644
--- a/sys/modules/umass/Makefile
+++ b/sys/modules/umass/Makefile
@@ -9,13 +9,15 @@ SRCS		 = bus_if.h device_if.h vnode_if.h \
 		   opt_usb.h opt_cam.h opt_scsi.h \
 		   umass.c
 NOMAN		 =
-CFLAGS		+= -g -O
+#CFLAGS		+= -g
+CFLAGS		= -g
 CLEANFILES	+= bus_if.h device_if.h vnode_if.h \
 		   opt_usb.h opt_cam.h opt_scsi.h \
 		   vnode_if.c
 
 opt_usb.h:
 	echo > opt_usb.h
+#	echo '#define UMASS_DEBUG 1' >> opt_usb.h
 opt_scsi.h:
 	echo '#define SCSI_DELAY 15000' > opt_scsi.h
 opt_cam.h:
diff --git a/sys/modules/umodem/Makefile b/sys/modules/umodem/Makefile
index 4a7e5cfb1f4..627d3f00af0 100644
--- a/sys/modules/umodem/Makefile
+++ b/sys/modules/umodem/Makefile
@@ -7,7 +7,7 @@ SOURCE		 = ${.CURDIR}/../../dev/usb
 KMOD		 = umodem_mod
 SRCS		 = bus_if.h device_if.h vnode_if.h opt_usb.h umodem.c
 NOMAN		 =
-CFLAGS		+= -g -O
+CFLAGS		+= -g
 CLEANFILES	+= bus_if.h device_if.h vnode_if.h opt_usb.h \
 		   vnode_if.c
 
diff --git a/sys/modules/ums/Makefile b/sys/modules/ums/Makefile
index af98c164013..e114198bbc1 100644
--- a/sys/modules/ums/Makefile
+++ b/sys/modules/ums/Makefile
@@ -7,7 +7,7 @@ SOURCE		 = ${.CURDIR}/../../dev/usb
 KMOD		 = ums_mod
 SRCS		 = bus_if.h device_if.h vnode_if.h opt_usb.h ums.c
 NOMAN		 =
-CFLAGS		+= -g -O
+CFLAGS		+= -g
 CLEANFILES	+= bus_if.h device_if.h vnode_if.h opt_usb.h \
 		   vnode_if.c