diff -Nur /usr/ports/palm/uppc-kmod/Makefile uppc-kmod/Makefile
--- /usr/ports/palm/uppc-kmod/Makefile	Sun Oct  9 12:46:59 2005
+++ uppc-kmod/Makefile	Wed Oct 12 15:42:07 2005
@@ -24,6 +24,13 @@
 
 .include <bsd.port.pre.mk>
 
+.if !exists(${PREFIX}/kld)
+PLIST_SUB+=	KLD="@comment "
+.else
+PLIST_SUB+=	KLD=""
+INSTALLKLD=
+.endif
+
 .if ${OSVERSION} < 500000
 BROKEN=		"Does not build on FreeBSD 4.x"
 .endif
@@ -32,12 +39,13 @@
 	@${REINPLACE_CMD} -e 's|%%INITIAL_INSTALLDIR%%|${PREFIX}/lib|g' ${BUILD_WRKSRC}/uppcsetup
 	@${REINPLACE_CMD} -e 's|%%INITIAL_MODDIR%%|${KMODDIR}|g' ${WRKSRC}/uppcsetup
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/uppc.ko ${PREFIX}/lib
+post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/uppcsetup ${PREFIX}/sbin
 	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN4} ${MANPREFIX}/man/man4
-
-post-install:
+.if defined(INSTALLKLD)
+	${MKDIR} ${PREFIX}/kld/uppc
+	${CP} ${WRKSRC}/uppc.c ${WRKSRC}/Makefile ${PREFIX}/kld/uppc/
+.endif
 	@${ECHO_CMD} "       ****************************************************************"
 	@${ECHO_CMD} "       * You can run 'uppcsetup' to help configure the device driver  *"
 	@${ECHO_CMD} "       * and set up a connection.                                     *"
diff -Nur /usr/ports/palm/uppc-kmod/files/patch-Makefile uppc-kmod/files/patch-Makefile
--- /usr/ports/palm/uppc-kmod/files/patch-Makefile	Thu Jan  1 09:30:00 1970
+++ uppc-kmod/files/patch-Makefile	Sun Oct  9 12:55:23 2005
@@ -0,0 +1,10 @@
+--- Makefile.orig	Sun Oct  9 12:55:05 2005
++++ Makefile	Sun Oct  9 12:55:11 2005
+@@ -13,6 +13,6 @@
+ 
+ CWARNFLAGS= -Wall
+ 
+-NOMAN=
++NO_MAN=
+ 
+ .include <bsd.kmod.mk>
diff -Nur /usr/ports/palm/uppc-kmod/pkg-plist uppc-kmod/pkg-plist
--- /usr/ports/palm/uppc-kmod/pkg-plist	Tue Dec 30 03:03:02 2003
+++ uppc-kmod/pkg-plist	Wed Oct 12 15:42:52 2005
@@ -1,2 +1,7 @@
-lib/uppc.ko
 sbin/uppcsetup
+%%KLD%%@unexec (cd %D/kld/uppc ; make clean)
+%%KLD%%kld/uppc/uppc.c
+%%KLD%%kld/uppc/Makefile
+%%KLD%%@dirrm kld/uppc
+@cwd /boot/kernel
+uppc.ko