diff -ruN --exclude=CVS /usr/ports/sysutils/uhidd/Makefile /usr/home/kaiw/port/uhidd/Makefile
--- /usr/ports/sysutils/uhidd/Makefile	2009-11-12 04:36:06.000000000 +0100
+++ /usr/home/kaiw/port/uhidd/Makefile	2010-03-06 21:56:02.000000000 +0100
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	uhidd
-PORTVERSION=	0.1.4
+PORTVERSION=	0.2.0
 CATEGORIES=	sysutils
-MASTER_SITES=	http://people.freebsd.org/~kaiw/distfiles/
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
+		http://people.freebsd.org/~kaiw/distfiles/
 
 MAINTAINER=	kaiwang27@gmail.com
 COMMENT=	Userland USB HID device driver using libusb20
@@ -22,6 +23,7 @@
 USE_RC_SUBR=	uhidd
 
 MAN4=		uvhid.4
+MAN5=		uhidd.conf.5
 MAN8=		uhidd.8
 
 .include <bsd.port.pre.mk>
@@ -46,6 +48,7 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/uhidd/uhidd ${PREFIX}/sbin/uhidd
 	${INSTALL_KLD} ${WRKSRC}/uvhid/uvhid.ko ${KMODDIR}/uvhid.ko
 	${INSTALL_MAN} ${WRKSRC}/uhidd/uhidd.8 ${PREFIX}/man/man8/uhidd.8
+	${INSTALL_MAN} ${WRKSRC}/uhidd/uhidd.conf.5 ${PREFIX}/man/man5/uhidd.conf.5
 	${INSTALL_MAN} ${WRKSRC}/uvhid/uvhid.4 ${PREFIX}/man/man4/uvhid.4
 .if !defined(WITHOUT_DEVD)
 	${MKDIR} ${PREFIX}/etc/devd
diff -ruN --exclude=CVS /usr/ports/sysutils/uhidd/distinfo /usr/home/kaiw/port/uhidd/distinfo
--- /usr/ports/sysutils/uhidd/distinfo	2009-09-19 22:20:28.000000000 +0200
+++ /usr/home/kaiw/port/uhidd/distinfo	2010-03-06 21:43:49.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (uhidd-0.1.4.tar.gz) = 3e026f0b29b6b9b60766cb7c16a7bffb
-SHA256 (uhidd-0.1.4.tar.gz) = 8c19ba127af58843b703a2b5fa91aa26817f179fb24bf20b4cb3c6c8dd40f022
-SIZE (uhidd-0.1.4.tar.gz) = 44160
+MD5 (uhidd-0.2.0.tar.gz) = cfdf56699fb8df62f02bc4c278d98998
+SHA256 (uhidd-0.2.0.tar.gz) = d447a1e5625f33892d619353b68d4d71151f492be1217443ace06470fadf2952
+SIZE (uhidd-0.2.0.tar.gz) = 54949
diff -ruN --exclude=CVS /usr/ports/sysutils/uhidd/files/pkg-message.in /usr/home/kaiw/port/uhidd/files/pkg-message.in
--- /usr/ports/sysutils/uhidd/files/pkg-message.in	2009-09-19 22:20:28.000000000 +0200
+++ /usr/home/kaiw/port/uhidd/files/pkg-message.in	2010-03-06 21:34:05.000000000 +0100
@@ -1,20 +1,26 @@
 ==============================================================================
 
-To use uhidd daemon for USB hid devices, you need to remove 'device ums',
-'device ukbd', and 'device uhid' from your kernel config file and recompile
-the kernel. Or if these drivers are loaded as kernel modules, kldunload them.
+To use uhidd daemon for USB HID devices, depends on which sub class
+driver you want to attach, to avoid confilicts between the daemon and
+the kernel drivers, you need to remove some of these entries 'device
+ums', 'device ukbd', or 'device uhid' from your kernel config file and
+recompile the kernel. Or if these drivers are loaded as kernel
+modules, kldunload those that conflicts.
 
 If you want to run uhidd deamon at the startup, add the following lines to
 /etc/rc.conf:
 
-	uhidd_flags="-kmhs"
+	uhidd_flags="-kmohs"
 	uhidd_enable="YES"
 
+Note that you need to modify the uhidd_flags (command line options)
+according to which sub class drivers you want to use.
+
 To manually start/stop uhidd daemon on certain device, run:
 
 	%%PREFIX%%/etc/rc.d/uhidd [start|stop] /dev/ugen.X.Y
 
-See http://wiki.freebsd.org/uhidd for more details about how to install and
+See http://wiki.FreeBSD.org/uhidd for more details about how to install and
 setup the daemon.
 
 ==============================================================================