diff --git a/sys/dev/usb/devlist2h.awk b/sys/dev/usb/devlist2h.awk
index 6b99b3d0df89..b0d0bbf03db1 100644
--- a/sys/dev/usb/devlist2h.awk
+++ b/sys/dev/usb/devlist2h.awk
@@ -1,5 +1,5 @@
 #! /usr/bin/awk -f
-#	$NetBSD: devlist2h.awk,v 1.6 1999/08/17 16:06:20 augustss Exp $
+#	$NetBSD: usb/devlist2h.awk,v 1.9 2001/01/18 20:28:22 jdolecek Exp $
 #  $FreeBSD$
 #
 # Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -175,7 +175,7 @@ END {
 
 	printf("\n") > dfile
 
-	printf("struct usb_knowndev usb_knowndevs[] = {\n") > dfile
+	printf("const struct usb_knowndev usb_knowndevs[] = {\n") > dfile
 	for (i = 1; i <= nproducts; i++) {
 		printf("\t{\n") > dfile
 		printf("\t    USB_VENDOR_%s, USB_PRODUCT_%s_%s,\n",
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index 3a70b7198eb3..b3df0e57bbf3 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_subr.c,v 1.82 2000/12/13 04:05:14 augustss Exp $	*/
+/*	$NetBSD: usb_subr.c,v 1.84 2001/01/18 20:28:22 jdolecek Exp $	*/
 /*	$FreeBSD$	*/
 
 /*
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index a3167d599bb5..3fad36de1d5f 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -44,7 +44,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-struct usb_knowndev usb_knowndevs[] = {
+const struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_HOMECONN,
 	    0,
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h
index 39f70cc7d3ab..799849714214 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/dev/usb/usbdi.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi.h,v 1.45 2000/12/13 04:05:15 augustss Exp $	*/
+/*	$NetBSD: usbdi.h,v 1.46 2001/01/18 20:28:23 jdolecek Exp $	*/
 /*	$FreeBSD$	*/
 
 /*
diff --git a/sys/tools/usbdevs2h.awk b/sys/tools/usbdevs2h.awk
index 6b99b3d0df89..b0d0bbf03db1 100644
--- a/sys/tools/usbdevs2h.awk
+++ b/sys/tools/usbdevs2h.awk
@@ -1,5 +1,5 @@
 #! /usr/bin/awk -f
-#	$NetBSD: devlist2h.awk,v 1.6 1999/08/17 16:06:20 augustss Exp $
+#	$NetBSD: usb/devlist2h.awk,v 1.9 2001/01/18 20:28:22 jdolecek Exp $
 #  $FreeBSD$
 #
 # Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -175,7 +175,7 @@ END {
 
 	printf("\n") > dfile
 
-	printf("struct usb_knowndev usb_knowndevs[] = {\n") > dfile
+	printf("const struct usb_knowndev usb_knowndevs[] = {\n") > dfile
 	for (i = 1; i <= nproducts; i++) {
 		printf("\t{\n") > dfile
 		printf("\t    USB_VENDOR_%s, USB_PRODUCT_%s_%s,\n",