diff -durN xvid.orig/Makefile xvid/Makefile
--- xvid.orig/Makefile	2008-09-08 00:02:28.000000000 -0300
+++ xvid/Makefile	2008-10-13 00:43:21.000000000 -0300
@@ -7,7 +7,7 @@
 
 PORTNAME=	xvid
 PORTVERSION=	1.1.3
-PORTEPOCH=	1
+PORTEPOCH=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.xvid.org/downloads/
 DISTNAME=	${PORTNAME}core-${PORTVERSION}
@@ -15,17 +15,27 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An opensource MPEG-4 codec, based on OpenDivx
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/nasm:${PORTSDIR}/devel/nasm
-
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/build/generic
+PLIST_FILES=	include/xvid.h \
+		lib/libxvidcore.a \
+		lib/libxvidcore.so \
+		lib/libxvidcore.so.4
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/build/generic
 
 OPTIONS=	OPTIMIZED_CFLAGS "Use XviD's default optimizations" off
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "amd64"
+CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+.endif
+.if ${ARCH} == "amd64" || ${ARCH} == "i386"
+BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
+.endif
+
 .if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS=		# let xvid's build system decide about those
 .endif
diff -durN xvid.orig/pkg-plist xvid/pkg-plist
--- xvid.orig/pkg-plist	2004-06-11 18:48:50.000000000 -0300
+++ xvid/pkg-plist	1969-12-31 21:00:00.000000000 -0300
@@ -1,4 +0,0 @@
-include/xvid.h
-lib/libxvidcore.a
-lib/libxvidcore.so
-lib/libxvidcore.so.4