diff --git a/media-libs/giflib/giflib-5.1.0.recipe b/media-libs/giflib/giflib-5.1.0.recipe
index 111d9f31a..6907bd71c 100644
--- a/media-libs/giflib/giflib-5.1.0.recipe
+++ b/media-libs/giflib/giflib-5.1.0.recipe
@@ -54,6 +54,7 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:make
+	cmd:grep
 	"
 
 PATCHES="giflib-5.1.0.patchset"
diff --git a/media-libs/giflib/giflib-5.0.5.recipe b/media-libs/giflib/giflib6-5.0.5.recipe
similarity index 78%
rename from media-libs/giflib/giflib-5.0.5.recipe
rename to media-libs/giflib/giflib6-5.0.5.recipe
index cdcf9f9df..22b1f5903 100644
--- a/media-libs/giflib/giflib-5.0.5.recipe
+++ b/media-libs/giflib/giflib6-5.0.5.recipe
@@ -15,8 +15,9 @@ abysm of MS-DOS, but Unix hackers are encouraged to spell it \"giflib\" in
 deference to local conventions. :-)
 "
 SUMMARY="giflib - A library for processing GIFs"
-HOMEPAGE="http://sourceforge.net/projects/giflib/" 
+HOMEPAGE="http://sourceforge.net/projects/giflib/"
 SRC_URI="http://sourceforge.net/projects/giflib/files/giflib-5.x/giflib-5.0.5.tar.bz2/download"
+SOURCE_DIR="giflib-$portVersion"
 CHECKSUM_SHA256="606d8a366b1c625ab60d62faeca807a799a2b9e88cbdf2a02bfcdf4429bf8609"
 LICENSE="MIT"
 COPYRIGHT="1997-2007 Eric S. Raymond and Toshio Kuratomi"
@@ -26,17 +27,8 @@ ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	giflib$secondaryArchSuffix = $portVersion
+	giflib6$secondaryArchSuffix = $portVersion
 	lib:libgif$secondaryArchSuffix = 6.0.1 compat >= 6
-	cmd:gif2raw$secondaryArchSuffix
-	cmd:gif2rgb$secondaryArchSuffix
-	cmd:gifbuild$secondaryArchSuffix
-	cmd:gifclrmp$secondaryArchSuffix
-	cmd:gifecho$secondaryArchSuffix
-	cmd:giffix$secondaryArchSuffix
-	cmd:gifinto$secondaryArchSuffix
-	cmd:giftext$secondaryArchSuffix
-	cmd:giftool$secondaryArchSuffix
 	"
 
 REQUIRES="
@@ -54,6 +46,7 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:make
+	cmd:grep
 	"
 
 PATCHES="giflib-5.0.5.patch"
@@ -67,6 +60,10 @@ BUILD()
 INSTALL()
 {
 	make install
+
+	# We do not want the binaries so that this doesn't conflict
+	# with the 'giflib' package
+	rm -rf $binDir
 	
 	prepareInstalledDevelLibs libgif
 	fixPkgconfig
@@ -77,10 +74,14 @@ INSTALL()
 }
 
 PROVIDES_devel="
-	giflib${secondaryArchSuffix}_devel = $portVersion compat >= 5
+	giflib6${secondaryArchSuffix}_devel = $portVersion compat >= 5
 	devel:libgif$secondaryArchSuffix = 6.0.1 compat >= 6
-	"
+"
 
 REQUIRES_devel="
-	giflib$secondaryArchSuffix == $portVersion base
-	"
+	giflib6$secondaryArchSuffix == $portVersion base
+"
+
+CONFLICTS_devel="
+        giflib${secondaryArchSuffix}_devel
+"