diff --git a/ggsn/Makefile.am b/ggsn/Makefile.am
index 91df8f0..c8868c1 100644
--- a/ggsn/Makefile.am
+++ b/ggsn/Makefile.am
@@ -4,7 +4,16 @@
 
 AM_CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS)
 
+if ENABLE_GTP_KERNEL
+AM_CFLAGS += -DGTP_KERNEL
+ggsn_LDADD = @EXEC_LDADD@ -lgtp -lgtpnl -L../gtp ../lib/libmisc.a $(LIBOSMOCORE_LIBS)
+else
 ggsn_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a $(LIBOSMOCORE_LIBS)
-ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a
-ggsn_SOURCES = ggsn.c cmdline.c cmdline.h
+endif
 
+ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a
+ggsn_SOURCES = ggsn.c cmdline.c cmdline.h gtp-kernel.h
+
+if ENABLE_GTP_KERNEL
+ggsn_SOURCES += gtp-kernel.c
+endif