diff --git a/efl/.footprint b/efl/.footprint
index 6a111dd..60d1cc8 100644
--- a/efl/.footprint
+++ b/efl/.footprint
@@ -285,12 +285,6 @@ drwxr-xr-x	root/root	usr/lib/efreet/
 drwxr-xr-x	root/root	usr/lib/efreet/linux-gnu-x86_64-1.8.6/
 -rwxr-xr-x	root/root	usr/lib/efreet/linux-gnu-x86_64-1.8.6/efreet_desktop_cache_create
 -rwxr-xr-x	root/root	usr/lib/efreet/linux-gnu-x86_64-1.8.6/efreet_icon_cache_create
-drwxr-xr-x	root/root	usr/lib/emotion/
-drwxr-xr-x	root/root	usr/lib/emotion/modules/
-drwxr-xr-x	root/root	usr/lib/emotion/modules/gstreamer/
-drwxr-xr-x	root/root	usr/lib/emotion/modules/gstreamer/linux-gnu-x86_64-1.8.6/
--rwxr-xr-x	root/root	usr/lib/emotion/modules/gstreamer/linux-gnu-x86_64-1.8.6/module.la
--rwxr-xr-x	root/root	usr/lib/emotion/modules/gstreamer/linux-gnu-x86_64-1.8.6/module.so
 drwxr-xr-x	root/root	usr/lib/ethumb/
 drwxr-xr-x	root/root	usr/lib/ethumb/modules/
 drwxr-xr-x	root/root	usr/lib/ethumb/modules/emotion/
diff --git a/efl/.md5sum b/efl/.md5sum
index 48d1c84..97cd1c9 100644
--- a/efl/.md5sum
+++ b/efl/.md5sum
@@ -1 +1,2 @@
+95c2898810338124430eb25306022f71  efl-1.8.6-giflib.patch
 bdcc2d17ec72a9a645cfcb155db5044c  efl-1.8.6.tar.gz
diff --git a/efl/Pkgfile b/efl/Pkgfile
index 423ee12..7041fb0 100644
--- a/efl/Pkgfile
+++ b/efl/Pkgfile
@@ -1,22 +1,26 @@
 # Description: efl libraries
 # URL: http://www.enlightenment.org/
 # Maintainer: Victor Martinez, pitillo at ono dot com
-# Depends on: lua dbus libsndfile xorg-libxp xorg-libxscrnsaver gst-plugins-base giflib libtiff
+# Depends on: lua dbus libsndfile xorg-libxp xorg-libxscrnsaver gst-plugins-base giflib libtiff gstreamer
 
 name=efl
 version=1.8.6
 release=1
-source=(http://download.enlightenment.org/rel/libs/$name/$name-$version.tar.gz)
+source=(http://download.enlightenment.org/rel/libs/$name/$name-$version.tar.gz
+	$name-$version-giflib.patch)
 
 build()
 {
     cd $name-$version 
+	patch -p1 -i $SRC/$name-$version-giflib.patch
     ./autogen.sh --prefix=/usr \
                 --disable-nls \
                 --with-tests=none \
                 --disable-fribidi \
                 --disable-pulseaudio \
                 --disable-physics \
+		--disable-gstreamer \
+		--enable-gstreamer1 \
                 --disable-doc
     make
     make -j1 DESTDIR=$PKG install
diff --git a/efl/efl-1.8.6-giflib.patch b/efl/efl-1.8.6-giflib.patch
new file mode 100644
index 0000000..429b91e
--- /dev/null
+++ b/efl/efl-1.8.6-giflib.patch
@@ -0,0 +1,39 @@
+diff -rupN a/src/modules/evas/loaders/gif/evas_image_load_gif.c b/src/modules/evas/loaders/gif/evas_image_load_gif.c
+--- a/src/modules/evas/loaders/gif/evas_image_load_gif.c	2014-05-19 16:10:12.000000000 +0000
++++ b/src/modules/evas/loaders/gif/evas_image_load_gif.c	2014-06-01 11:05:50.963850389 +0000
+@@ -528,7 +528,7 @@ evas_image_load_file_head_gif2(void *loa
+    ret = EINA_TRUE;
+ 
+ on_error: // jump here on any errors to clean up
+-   if (gif) DGifCloseFile(gif);
++   if (gif) DGifCloseFile(gif, NULL);
+    if (fi.map) eina_file_map_free(f, fi.map);
+    return ret;
+ }
+@@ -606,7 +606,7 @@ open_file:
+    // start as we have nothnig to build on
+    if ((index > 0) && (index < loader->imgnum) && (animated->animated))
+      {
+-        if (loader->gif) DGifCloseFile(loader->gif);
++        if (loader->gif) DGifCloseFile(loader->gif, NULL);
+         if ((loader->fi.map) && (loader->f))
+           eina_file_map_free(loader->f, loader->fi.map);
+         loader->gif = NULL;
+@@ -764,7 +764,7 @@ open_file:
+    loader->imgnum = imgnum;
+    if ((animated->frame_count <= 1) || (rec == TERMINATE_RECORD_TYPE))
+      {
+-        if (loader->gif) DGifCloseFile(loader->gif);
++        if (loader->gif) DGifCloseFile(loader->gif, NULL);
+         if ((loader->fi.map) && (loader->f))
+           eina_file_map_free(loader->f, loader->fi.map);
+         loader->gif = NULL;
+@@ -848,7 +848,7 @@ static void
+ evas_image_load_file_close_gif2(void *loader_data)
+ {
+    Loader_Info *loader = loader_data;
+-   if (loader->gif) DGifCloseFile(loader->gif);
++   if (loader->gif) DGifCloseFile(loader->gif, NULL);
+    if ((loader->fi.map) && (loader->f))
+      eina_file_map_free(loader->f, loader->fi.map);
+    free(loader);