diff --git a/etc/MAKEDEV b/etc/MAKEDEV
index 0affad3cafc..3cbb27c3a49 100644
--- a/etc/MAKEDEV
+++ b/etc/MAKEDEV
@@ -121,7 +121,7 @@
 #	ipl	ipfilter control devices (ipl, ipnat, ipstate, ipauth)
 #	kbd	keyboard devices
 #
-#	$Id: MAKEDEV,v 1.181 1999/01/08 16:03:57 hm Exp $
+#	$Id: MAKEDEV,v 1.182 1999/01/11 00:03:58 n_hibma Exp $
 #
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:$PATH
@@ -780,6 +780,11 @@ ulpt*)
 	mknod ulpt$unit c 113 $unit
 	;;
 
+ugen*)
+	unit=`expr $i : 'ugen\(.*\)'`
+	mknod ugen$unit c 114 $unit
+	;;
+
 lpt*)
 	unit=`expr $i : 'lpt\(.*\)'`
 	mknod lpt$unit c 16 $unit
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 0affad3cafc..3cbb27c3a49 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -121,7 +121,7 @@
 #	ipl	ipfilter control devices (ipl, ipnat, ipstate, ipauth)
 #	kbd	keyboard devices
 #
-#	$Id: MAKEDEV,v 1.181 1999/01/08 16:03:57 hm Exp $
+#	$Id: MAKEDEV,v 1.182 1999/01/11 00:03:58 n_hibma Exp $
 #
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:$PATH
@@ -780,6 +780,11 @@ ulpt*)
 	mknod ulpt$unit c 113 $unit
 	;;
 
+ugen*)
+	unit=`expr $i : 'ugen\(.*\)'`
+	mknod ugen$unit c 114 $unit
+	;;
+
 lpt*)
 	unit=`expr $i : 'lpt\(.*\)'`
 	mknod lpt$unit c 16 $unit
diff --git a/sys/conf/majors b/sys/conf/majors
index ff4c5be2a13..01952a40505 100644
--- a/sys/conf/majors
+++ b/sys/conf/majors
@@ -1,4 +1,4 @@
-$Id: majors.i386,v 1.60 1999/01/06 05:35:39 yokota Exp $
+$Id: majors.i386,v 1.61 1999/01/11 00:03:58 n_hibma Exp $
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
@@ -158,5 +158,6 @@ chrdev	name		comments
 111	ums		USB Mouse (nick.hibma@jrc.it)
 112	kbd		keyboard
 113	ulpt		USB Printer (nick.hibma@jrc.it)
+114	ugen		USB Generic device (nick.hibma@jrc.it)
 200	??		entries from 200-255 are reserved for local use
 255	??		entries from 200-255 are reserved for local use
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index bd5305106ca..942c554aa80 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: ugen.c,v 1.11 1999/01/08 11:58:25 augustss Exp $	*/
-/*	FreeBSD $Id: ugen.c,v 1.4 1999/01/07 23:31:32 n_hibma Exp $ */
+/*	$FreeBSD$	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
 #ifdef USB_DEBUG
 #define DPRINTF(x)	if (ugendebug) printf x
 #define DPRINTFN(n,x)	if (ugendebug>(n)) printf x
-int	ugendebug = 0;
+int	ugendebug = 1;
 #else
 #define DPRINTF(x)
 #define DPRINTFN(n,x)
@@ -113,6 +113,8 @@ void ugenintr __P((usbd_request_handle reqh, usbd_private_handle addr,
 		   usbd_status status));
 void ugen_disco __P((void *));
 
+#define UGEN_CDEV_MAJOR	114
+
 int ugen_set_config __P((struct ugen_softc *sc, int configno));
 usb_config_descriptor_t *ugen_get_cdesc __P((struct ugen_softc *sc, int index,
 					     int *lenp));
diff --git a/sys/i386/conf/majors.i386 b/sys/i386/conf/majors.i386
index ff4c5be2a13..01952a40505 100644
--- a/sys/i386/conf/majors.i386
+++ b/sys/i386/conf/majors.i386
@@ -1,4 +1,4 @@
-$Id: majors.i386,v 1.60 1999/01/06 05:35:39 yokota Exp $
+$Id: majors.i386,v 1.61 1999/01/11 00:03:58 n_hibma Exp $
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
@@ -158,5 +158,6 @@ chrdev	name		comments
 111	ums		USB Mouse (nick.hibma@jrc.it)
 112	kbd		keyboard
 113	ulpt		USB Printer (nick.hibma@jrc.it)
+114	ugen		USB Generic device (nick.hibma@jrc.it)
 200	??		entries from 200-255 are reserved for local use
 255	??		entries from 200-255 are reserved for local use