diff --git a/multimedia/xmps-opendivx-plugin/Makefile b/multimedia/xmps-opendivx-plugin/Makefile
index 1a9215323f49..5b126e096897 100644
--- a/multimedia/xmps-opendivx-plugin/Makefile
+++ b/multimedia/xmps-opendivx-plugin/Makefile
@@ -25,7 +25,8 @@ USE_INC_LIBTOOL_VER=13
 USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-PLIST_SUB=	LIB_VERSION="${LIB_VERSION}"
+PLIST_FILES=	lib/xmps/codecs/video/libopendivx.so \
+		lib/xmps/codecs/video/libopendivx.so.${LIB_VERSION}
 
 LIB_VERSION=	0
 
diff --git a/multimedia/xmps-opendivx-plugin/pkg-plist b/multimedia/xmps-opendivx-plugin/pkg-plist
deleted file mode 100644
index 4e8b51bf57bb..000000000000
--- a/multimedia/xmps-opendivx-plugin/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/xmps/codecs/video/libopendivx.so
-lib/xmps/codecs/video/libopendivx.so.%%LIB_VERSION%%
diff --git a/multimedia/xmps-win32-plugin/Makefile b/multimedia/xmps-win32-plugin/Makefile
index f7105823f96f..4c70fb5d40b8 100644
--- a/multimedia/xmps-win32-plugin/Makefile
+++ b/multimedia/xmps-win32-plugin/Makefile
@@ -17,8 +17,6 @@ COMMENT=	xmps plugin for Win32 (TM) Codecs
 LIB_DEPENDS=	xmps.0:${PORTSDIR}/multimedia/xmps
 RUN_DEPENDS=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 
-BROKEN=		Incomplete pkg-plist
-
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=13
@@ -26,12 +24,14 @@ USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-PLIST_SUB=	LIB_VERSION="${LIB_VERSION}"
 
 #CODEC_PORT=	${PORTSDIR}/multimedia/win32-codecs
 CODEC_PORT=	${.CURDIR}/../win32-codecs
 CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
 LIB_VERSION=	0
+PLIST_FILES=	lib/xmps/codecs/video/libwin32.so \
+		lib/xmps/codecs/video/libwin32.so.${LIB_VERSION} \
+		lib/xmps/codecs/video/libwin32.la
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/lib/win32|${LOCALBASE}/lib/win32|" \
diff --git a/multimedia/xmps-win32-plugin/pkg-plist b/multimedia/xmps-win32-plugin/pkg-plist
deleted file mode 100644
index 814f5d7380e2..000000000000
--- a/multimedia/xmps-win32-plugin/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/xmps/codecs/video/libwin32.so
-lib/xmps/codecs/video/libwin32.so.%%LIB_VERSION%%