diff --git a/palm/uppc-kmod/Makefile b/palm/uppc-kmod/Makefile
index fc94252ebe48..bceb1ac2794f 100644
--- a/palm/uppc-kmod/Makefile
+++ b/palm/uppc-kmod/Makefile
@@ -1,49 +1,45 @@
 # New ports collection makefile for:	uppc-kmod
 # Date created:				31 August 2003
 # Whom:					Sam Lawrance <boris@brooknet.com.au>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	uppc
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	palm kld
 MASTER_SITES=	http://www.people.tecnik93.com/~sam/ports/
 PKGNAMESUFFIX=	-kmod
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	USB device driver for Windows CE handhelds
 
 MAN4=		uppc.4
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 .if !exists(/usr/src/sys/dev/usb/usb.h)
 IGNORE=		Requires kernel source (/usr/src/sys) to build
 .endif
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
 post-build:
 	@${REINPLACE_CMD} -e 's|%%INITIAL_INSTALLDIR%%|${PREFIX}/lib|g' ${BUILD_WRKSRC}/uppcsetup
 	@${REINPLACE_CMD} -e 's|%%INITIAL_MODDIR%%|${KMODDIR}|g' ${WRKSRC}/uppcsetup
 .if ${OSVERSION} < 600000
 	@${REINPLACE_CMD} -e 's|cuaU|ucom|' ${WRKSRC}/uppcsetup
 .endif
 
 do-install:
 	${INSTALL_KLD} ${WRKSRC}/uppc.ko ${PREFIX}/lib
 	${INSTALL_SCRIPT} ${WRKSRC}/uppcsetup ${PREFIX}/sbin
 	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN4} ${MANPREFIX}/man/man4
 
 post-install:
 	@${ECHO_CMD} "       ****************************************************************"
 	@${ECHO_CMD} "       * You can run 'uppcsetup' to help configure the device driver  *"
 	@${ECHO_CMD} "       * and set up a connection.                                     *"
 	@${ECHO_CMD} "       ****************************************************************"
 
 .include <bsd.port.post.mk>
diff --git a/palm/uppc-kmod/files/patch-uppc.c b/palm/uppc-kmod/files/patch-uppc.c
index 494137645e6d..04945ccba606 100644
--- a/palm/uppc-kmod/files/patch-uppc.c
+++ b/palm/uppc-kmod/files/patch-uppc.c
@@ -1,30 +1,41 @@
---- uppc.c.orig	Sun Sep 12 05:39:44 2004
-+++ uppc.c	Thu Jan 25 23:40:56 2007
+--- uppc.c.orig	2008-01-02 17:34:35.000000000 +0000
++++ uppc.c	2008-01-02 17:34:47.000000000 +0000
 @@ -62,6 +62,8 @@
  #define USB_PRODUCT_TOSHIBA_E330	0x0707
  #define USB_PRODUCT_TOSHIBA_E740	0x0706
  
 +#define USB_PRODUCT_SAMSUNG_I730	0x6662
 +
  #include <sys/cdefs.h>
  
  #include <sys/param.h>
-@@ -93,6 +95,10 @@
+@@ -84,6 +86,10 @@
+ 
+ #include <sys/sysctl.h>
+ 
++#if __FreeBSD_version >= 700049
++#include <dev/usb/usb_port.h>
++#endif
++
+ #include <dev/usb/usb.h>
+ 
+ #include <dev/usb/usbcdc.h>
+@@ -93,6 +99,10 @@
  
  #include <dev/usb/ucomvar.h>
  
 +#ifndef USBDEVNAME
 +#define USBDEVNAME	device_get_nameunit
 +#endif
 +
  static int uppcrtvendor = 0;
  static int uppcrtproduct = 0;
  
-@@ -166,6 +172,7 @@
+@@ -166,6 +176,7 @@
  	{{ USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_UNK }, 0},
  	{{ USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_E330 }, 0},
  	{{ USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_E740 }, 0},
 +	{{ USB_VENDOR_SAMSUNG, USB_PRODUCT_SAMSUNG_I730 }, 0},
  };
  
  /* The ucom_softc structure plus anything else we might need. */
diff --git a/palm/uppc-kmod/files/patch-uppcsetup b/palm/uppc-kmod/files/patch-uppcsetup
new file mode 100644
index 000000000000..c51998f63e79
--- /dev/null
+++ b/palm/uppc-kmod/files/patch-uppcsetup
@@ -0,0 +1,10 @@
+--- uppcsetup.orig	2008-01-02 14:09:25.000000000 +0000
++++ uppcsetup	2008-01-02 14:09:57.000000000 +0000
+@@ -132,6 +132,7 @@
+ dialog --msgbox "If your Pocket PC is physically connected to your computer, please disconnect it now and wait 60 seconds before continuing or your machine may PANIC." 8 65
+ 
+ cp ${INSTALLDIR}/uppc.ko ${MODDIR}/uppc.ko 
++kldxref ${MODDIR}
+ 
+ echo 'uppc_load="YES"' >> /boot/loader.conf
+