diff --git a/multimedia/pwcbsd/Makefile b/multimedia/pwcbsd/Makefile
index f1b2b735b70a..eacf7aaba713 100644
--- a/multimedia/pwcbsd/Makefile
+++ b/multimedia/pwcbsd/Makefile
@@ -1,65 +1,26 @@
 PORTNAME=	pwcbsd
 PORTVERSION=	1.4.1
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	multimedia sysutils
 MASTER_SITES=	http://raaf.atspace.org/ \
 		http://www.bsd-geek.de/FreeBSD/distfiles/ \
 		LOCAL/miwi
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Linux pwc webcam driver ported to FreeBSD
 WWW=		http://raaf.atspace.org/
 
 LICENSE=	GPLv2
 
-CONFLICTS=	pwcview
-
-SSP_UNSAFE=	kernel module does not support ssp
-
-USES=		kmod
+USES=		kmod uidfix
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-OPTIONS_DEFINE=	PROGRAMS MMAP
-OPTIONS_DEFAULT=	PROGRAMS
-PROGRAMS_DESC=	Build the programs
-MMAP_DESC=	Enable mmap support (MAY CRASH YOUR SYSTEM)
-
-CFLAGS+=	-Wno-error
-
-.include <bsd.port.options.mk>
-
-.if !exists(${SRC_BASE}/sys/Makefile)
-IGNORE=		requires kernel source files
-.endif
-
-.if ${PORT_OPTIONS:MMMAP}
-ALL_TARGET=	mmap
-.else
-ALL_TARGET=	all
-.endif
-.if ${PORT_OPTIONS:MPROGRAMS}
-ALL_TARGET+=	pwcview
-PROGRAMS=	pwcview
-USES+=		jpeg sdl
-USE_SDL=	sdl
-PLIST_SUB+=	PROGRAMS=""
-.else
-PLIST_SUB+=	PROGRAMS="@comment "
-.endif
-
-post-patch:
-.if ${PORT_OPTIONS:MPROGRAMS}
-	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/Makefile
-.endif
+MAKEFILE=	Makefile.kld
 
-do-install:
-	${MKDIR} ${STAGEDIR}${KMODDIR}
-	${INSTALL_KLD} ${WRKSRC}/pwc.ko ${STAGEDIR}${KMODDIR}
+PLIST_FILES=	${KMODDIR}/pwc.ko \
+		share/man/man4/pwc.4.gz
+post-install:
 	${INSTALL_MAN} ${WRKSRC}/pwc.4 ${STAGEDIR}${PREFIX}/share/man/man4
-.if ${PORT_OPTIONS:MPROGRAMS}
-	${INSTALL_PROGRAM} ${PROGRAMS:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${PROGRAMS:S|^|${WRKSRC}/|}.1 ${STAGEDIR}${PREFIX}/share/man/man1
-.endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/pwcbsd/files/patch-pwcview.c b/multimedia/pwcbsd/files/patch-pwcview.c
deleted file mode 100644
index ed407a6ba22a..000000000000
--- a/multimedia/pwcbsd/files/patch-pwcview.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- pwcview.c.orig	2007-10-09 07:03:10 UTC
-+++ pwcview.c
-@@ -837,6 +837,8 @@ void jpeg_write(int height, JSAMPIMAGE jimage, struct 
- 	jdata[1] = jimage[1];
- 	jdata[2] = jimage[2];
- 	
-+	cinfo->raw_data_in = TRUE;
-+	cinfo->do_fancy_downsampling = FALSE;
- 	jpeg_stdio_dest(cinfo, outfile);
- 	jpeg_start_compress(cinfo, TRUE);
- 
diff --git a/multimedia/pwcbsd/pkg-plist b/multimedia/pwcbsd/pkg-plist
deleted file mode 100644
index 8a31e80c4b52..000000000000
--- a/multimedia/pwcbsd/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-%%PROGRAMS%%bin/pwcview
-%%PROGRAMS%%share/man/man1/pwcview.1.gz
-share/man/man4/pwc.4.gz
-/%%KMODDIR%%/pwc.ko