diff --git a/common/shlibs b/common/shlibs
index 01447ca81b9..5d08ab0bea5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -348,6 +348,7 @@ libfaad.so.2 faad2-2.7_1
 libid3tag.so.0 libid3tag-0.15.1b_1
 libgif.so.4 giflib-4.1.6_1
 libungif.so.4 giflib-4.1.6_1
+libgif.so.6 giflib-5.0.1_1
 libImlib2.so.1 imlib2-1.4.2_1
 libmp3lame.so.0 lame-3.98.2_1
 libavdevice.so.53 libavdevice-0.8.6_1
diff --git a/srcpkgs/giflib/giflib-devel.template b/srcpkgs/giflib/giflib-devel.template
index 9dab2e2d316..3b14b429d13 100644
--- a/srcpkgs/giflib/giflib-devel.template
+++ b/srcpkgs/giflib/giflib-devel.template
@@ -1,18 +1,12 @@
 # Template file for 'giflib-devel'.
 #
-depends="libSM-devel libICE-devel libX11-devel giflib"
+noarch=yes
+depends="giflib-${version}_${revision}"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	#mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
-	#mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
+do_install() {
+	vmove usr/include usr
 }
diff --git a/srcpkgs/giflib/giflib-tools.rshlibs b/srcpkgs/giflib/giflib-tools.rshlibs
index c4df739d898..adaf79e583b 100644
--- a/srcpkgs/giflib/giflib-tools.rshlibs
+++ b/srcpkgs/giflib/giflib-tools.rshlibs
@@ -1,4 +1,3 @@
-libgif.so.4
+libgif.so.6
 libc.so.6
 libm.so.6
-libX11.so.6
diff --git a/srcpkgs/giflib/giflib.rshlibs b/srcpkgs/giflib/giflib.rshlibs
index 85d98dde265..631aa1dda40 100644
--- a/srcpkgs/giflib/giflib.rshlibs
+++ b/srcpkgs/giflib/giflib.rshlibs
@@ -1,4 +1 @@
-libSM.so.6
-libICE.so.6
-libX11.so.6
 libc.so.6
diff --git a/srcpkgs/giflib/template b/srcpkgs/giflib/template
index 696cc4f4f99..e1c225f452d 100644
--- a/srcpkgs/giflib/template
+++ b/srcpkgs/giflib/template
@@ -1,29 +1,17 @@
 # Template file for 'giflib'
 pkgname=giflib
-version=4.1.6
-revision=4
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
+version=5.0.1
+revision=1
+subpackages="$pkgname-devel $pkgname-tools"
 build_style=gnu-configure
-makedepends="libSM-devel libICE-devel libX11-devel"
+configure_args="--disable-static"
+makedepends="xmlto"
 short_desc="library for GIF images"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=ceca77dcd29eb6f6d0336414dfecc9094413f71c3b589afcf96bb72fbfb08ce0
+homepage="http://sourceforge.net/projects/giflib/"
+license="MIT"
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
+checksum=91f55f674fb7fc95edbe80b3e9fd8d5e26a7df357b1316239383dfd07c1ce382
 long_desc="
  GIFLIB is a package of portable tools and library routines for working
  with GIF images."
-
-subpackages="$pkgname-devel $pkgname-tools"
-
-post_install()
-{
-	cd ${wrksrc} || return 1
-
-	# libungif compatibility - instructions taken from Redhat specfile
-	local MAJOR=`echo ${pkgver} | sed 's/\([0-9]\+\)\..*/\1/'`
-	gcc -shared -Wl,-soname,libungif.so.${MAJOR} -Llib/.libs \
-		-lgif -o libungif.so.${version} || return 1
-	install -m755 libungif.so.${version} ${DESTDIR}/usr/lib || return 1
-	ln -sf libungif.so.${version} \
-		${DESTDIR}/usr/lib/libungif.so.4 || return 1
-	ln -sf libungif.so.4 ${DESTDIR}/usr/lib/libungif.so || return 1
-}