diff --git a/src/Makefile.am b/src/Makefile.am
index 3f3d13361..f75837505 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -85,11 +85,16 @@ neutrino_LDADD = \
 	@AVUTIL_LIBS@ \
 	$(FLACLIBS) \
 	$(VORBISLIBS) \
-	-lungif \
 	-ljpeg \
 	-lOpenThreads \
 	-lrt -lpthread
 
+if ENABLE_GIFLIB
+neutrino_LDADD += -lgif
+else
+neutrino_LDADD += -lungif
+endif
+
 if ENABLE_UPNP
 neutrino_LDADD += \
 	$(top_builddir)/lib/libupnpclient/libtuxbox-upnpclient.a