diff --git a/media-libs/libnsgif/libnsgif-0.2.0.recipe b/media-libs/libnsgif/libnsgif-0.2.1.recipe
similarity index 53%
rename from media-libs/libnsgif/libnsgif-0.2.0.recipe
rename to media-libs/libnsgif/libnsgif-0.2.1.recipe
index dd60460a2..bfa4c16ce 100644
--- a/media-libs/libnsgif/libnsgif-0.2.0.recipe
+++ b/media-libs/libnsgif/libnsgif-0.2.1.recipe
@@ -1,19 +1,24 @@
 SUMMARY="A decoding library for GIF images"
 DESCRIPTION="Libnsgif is a decoding library for GIF image file format"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/"
-COPYRIGHT="2006 Richard Wilson
-	2008-2017 Sean Fox"
+HOMEPAGE="https://www.netsurf-browser.org/projects/libnsgif/"
+COPYRIGHT="2003-2018 The NetSurf Developers"
 LICENSE="MIT"
 REVISION="1"
-SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libnsgif-$portVersion-src.tar.gz"
-CHECKSUM_SHA256="0a8dd99f2260c645c940f15eb6527ec8116a1524813b93c069d654222a701cde"
+SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libnsgif-$portVersion-src.tar.gz"
+CHECKSUM_SHA256="9eaea534cd70b53c5aaf45317ae957701685a6b4a88dbe34ed26f4faae879a4b"
+if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
+PATCHES="libnsgif-$portVersion-gcc2.patchset"
+fi
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	libnsgif$secondaryArchSuffix = $portVersion
-	lib:libnsgif$secondaryArchSuffix = $portVersion
+	lib:libnsgif$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -21,7 +26,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libnsgif${secondaryArchSuffix}_devel = $portVersion
-	devel:libnsgif$secondaryArchSuffix = $portVersion
+	devel:libnsgif$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libnsgif$secondaryArchSuffix == $portVersion base
@@ -39,7 +44,7 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	for linkage in lib-static lib-shared; do
-		make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		make PREFIX="$prefix" NSSHARED=/system/data/netsurf-buildsystem \
 			COMPONENT_TYPE=$linkage
 	done
 }
@@ -47,7 +52,7 @@ BUILD()
 INSTALL()
 {
 	for linkage in lib-static lib-shared; do
-		make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		make PREFIX="$prefix" NSSHARED=/system/data/netsurf-buildsystem \
 			COMPONENT_TYPE=$linkage \
 			INCLUDEDIR=$relativeIncludeDir install \
 			LIBDIR=$relativeLibDir
@@ -58,5 +63,5 @@ INSTALL()
 
 	# devel package
 	packageEntries devel \
-		$developDir
+		"$developDir"
 }
diff --git a/media-libs/libnsgif/patches/libnsgif-0.2.1-gcc2.patchset b/media-libs/libnsgif/patches/libnsgif-0.2.1-gcc2.patchset
new file mode 100644
index 000000000..ebe78b1e3
--- /dev/null
+++ b/media-libs/libnsgif/patches/libnsgif-0.2.1-gcc2.patchset
@@ -0,0 +1,46 @@
+From de35bdb4f508cdf9a900781209dfb196d4f5acbe Mon Sep 17 00:00:00 2001
+From: fbrosson <fbrosson@localhost>
+Date: Sun, 23 Sep 2018 08:41:22 +0000
+Subject: C89 fixes for gcc2 compatibility
+
+
+diff --git a/src/lzw.c b/src/lzw.c
+index 31cf7d4..355b14e 100644
+--- a/src/lzw.c
++++ b/src/lzw.c
+@@ -178,11 +178,10 @@ static inline lzw_result lzw__next_code(
+ 		uint8_t bits_remaining_0 = (code_size < (8 - current_bit)) ?
+ 				code_size : (8 - current_bit);
+ 		uint8_t bits_remaining_1 = code_size - bits_remaining_0;
+-		uint8_t bits_used[3] = {
+-			[0] = bits_remaining_0,
+-			[1] = bits_remaining_1 < 8 ? bits_remaining_1 : 8,
+-			[2] = bits_remaining_1 - 8,
+-		};
++		uint8_t bits_used[3];
++		bits_used[0] = bits_remaining_0;
++		bits_used[1] = bits_remaining_1 < 8 ? bits_remaining_1 : 8;
++		bits_used[2] = bits_remaining_1 - 8;
+ 
+ 		while (true) {
+ 			const uint8_t *data = ctx->sb_data;
+@@ -271,6 +270,7 @@ lzw_result lzw_decode_init(
+ 		const uint8_t ** const stack_pos_out)
+ {
+ 	struct lzw_dictionary_entry *table = ctx->table;
++	uint32_t i;
+ 
+ 	/* Initialise the input reading context */
+ 	ctx->input.data = compressed_data;
+@@ -287,7 +287,7 @@ lzw_result lzw_decode_init(
+ 	ctx->eoi_code   = (1 << code_size) + 1;
+ 
+ 	/* Initialise the standard dictionary entries */
+-	for (uint32_t i = 0; i < ctx->clear_code; ++i) {
++	for (i = 0; i < ctx->clear_code; ++i) {
+ 		table[i].first_value = i;
+ 		table[i].last_value  = i;
+ 	}
+-- 
+2.19.0
+