diff --git a/media-video/vcdimager/vcdimager-0.7.24.recipe b/media-video/vcdimager/vcdimager-0.7.24.recipe
index ced1d5739..ae0c2d386 100644
--- a/media-video/vcdimager/vcdimager-0.7.24.recipe
+++ b/media-video/vcdimager/vcdimager-0.7.24.recipe
@@ -17,26 +17,32 @@ lists)
 * Runs on all major UNIX flavors and on Win32
 * Use of XML for the description of Video CDs"
 HOMEPAGE="http://www.vcdimager.org/"
-COPYRIGHT="2002 Herbert Valerio Riedel"
+COPYRIGHT="2000-2004 Herbert Valerio Riedel
+	2001 Arnd Bergmann
+	2004-2011 Rocky Bernstein"
 LICENSE="GNU GPL v2"
-REVISION="2"
-SOURCE_URI="ftp://ftp.mirror.nl/pub/mirror/gnu/vcdimager/vcdimager-0.7.24.tar.gz"
+REVISION="3"
+SOURCE_URI="http://ftpmirror.gnu.org/vcdimager/vcdimager-$portVersion.tar.gz"
 CHECKSUM_SHA256="075d7a67353ff3004745da781435698b6bc4a053838d0d4a3ce0516d7d974694"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	vcdimager${secondaryArchSuffix} = $portVersion
-	cmd:vcdimager$secondaryArchSuffix
-	cmd:cdxa2mpeg$secondaryArchSuffix
-	cmd:vcd_info$secondaryArchSuffix
-	cmd:vcdxbuild$secondaryArchSuffix
-	cmd:vcdxgen$secondaryArchSuffix
-	cmd:vcdxminfo$secondaryArchSuffix
-	cmd:vcdxrip$secondaryArchSuffix
-	lib:libvcdinfo$secondaryArchSuffix
+	lib:libvcdinfo$secondaryArchSuffix = 0.2.0
 	"
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES="$PROVIDES
+		cmd:cdxa2mpeg = $portVersion
+		cmd:vcd_info = $portVersion
+		cmd:vcdimager = $portVersion
+		cmd:vcdxbuild = $portVersion
+		cmd:vcdxgen = $portVersion
+		cmd:vcdxminfo = $portVersion
+		cmd:vcdxrip = $portVersion
+		"
+fi
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libcdio$secondaryArchSuffix
@@ -48,7 +54,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	vcdimager${secondaryArchSuffix}_devel = $portVersion
-	devel:libvcdinfo$secondaryArchSuffix = $portVersion
+	devel:libvcdinfo$secondaryArchSuffix = 0.2.0
 	"
 REQUIRES_devel="
 	vcdimager$secondaryArchSuffix == $portVersion base
@@ -93,6 +99,10 @@ INSTALL()
 {
 	make install
 
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $documentationDir $binDir
+	fi
+
 	# prepare develop/lib
 	prepareInstalledDevelLibs libvcdinfo
 	fixPkgconfig
@@ -100,3 +110,8 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
+
+TEST()
+{
+	make check
+}