--- a/src/Makefile	2016-03-04 17:03:40.000000000 +0100
+++ b/src/Makefile	2016-03-22 07:18:35.964456340 +0100
@@ -115,9 +115,6 @@
 ifeq ($(DISABLE_M2PS), no)
 LIBGPAC_MEDIATOOLS+=media_tools/mpeg2_ps.o
 endif
-ifeq ($(DISABLE_OGG), no)
-LIBGPAC_MEDIATOOLS+=media_tools/gpac_ogg.o
-endif
 ifeq ($(DISABLE_MCRYPT), no)
 LIBGPAC_MEDIATOOLS+=media_tools/ismacryp.o
 endif
@@ -235,6 +232,16 @@
 EXTRALIBS+= -lrt
 endif
 
+# - OGG support
+ifeq ($(CONFIG_OGG), no)
+else
+LINKLIBS+= -logg
+ifeq ($(CONFIG_OGG), local)
+NEED_LOCAL_LIB="yes"
+MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/ogg"
+endif
+endif
+
 SRCS := $(OBJS:.o=.c) 
 
 all: lib