diff --git a/ggsn/Makefile.am b/ggsn/Makefile.am
index 05211a6..b72006e 100644
--- a/ggsn/Makefile.am
+++ b/ggsn/Makefile.am
@@ -1,11 +1,11 @@
 bin_PROGRAMS = ggsn
 
-CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' -lgtp
+LDFLAGS = -Wl,--rpath -Wl,/usr/local/lib
+
+CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' -lgtp
 
 ggsn_SOURCES = ggsn.c tun.c tun.h cmdline.c cmdline.h
 
-cmdline.c: cmdline.ggo
-	gengetopt < cmdline.ggo --unamed-opts
 
 
 
diff --git a/ggsn/Makefile.in b/ggsn/Makefile.in
index 6fc4bcd..9c1eab5 100644
--- a/ggsn/Makefile.in
+++ b/ggsn/Makefile.in
@@ -73,7 +73,9 @@ VERSION = @VERSION@
 
 bin_PROGRAMS = ggsn
 
-CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' -lgtp
+LDFLAGS = -Wl,--rpath -Wl,/usr/local/lib
+
+CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' -lgtp
 
 ggsn_SOURCES = ggsn.c tun.c tun.h cmdline.c cmdline.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -83,7 +85,6 @@ PROGRAMS =  $(bin_PROGRAMS)
 
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 ggsn_OBJECTS =  ggsn.o tun.o cmdline.o
 ggsn_LDADD = $(LDADD)
@@ -335,9 +336,6 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
-cmdline.c: cmdline.ggo
-	gengetopt < cmdline.ggo --unamed-opts
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/sgsnemu/Makefile.am b/sgsnemu/Makefile.am
index 064f91f..ba6fabf 100644
--- a/sgsnemu/Makefile.am
+++ b/sgsnemu/Makefile.am
@@ -1,11 +1,11 @@
 bin_PROGRAMS = sgsnemu
 
-CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' -lgtp
+LDFLAGS = -Wl,--rpath -Wl,/usr/local/lib
+
+CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' -lgtp
 
 sgsnemu_SOURCES = sgsnemu.c tun.c tun.h cmdline.c cmdline.h
 
-cmdline.c: cmdline.ggo
-	gengetopt < cmdline.ggo --unamed-opts --conf-parser
 
 
 
diff --git a/sgsnemu/Makefile.in b/sgsnemu/Makefile.in
index b99ad73..d5d3d9e 100644
--- a/sgsnemu/Makefile.in
+++ b/sgsnemu/Makefile.in
@@ -73,7 +73,9 @@ VERSION = @VERSION@
 
 bin_PROGRAMS = sgsnemu
 
-CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' -lgtp
+LDFLAGS = -Wl,--rpath -Wl,/usr/local/lib
+
+CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' -lgtp
 
 sgsnemu_SOURCES = sgsnemu.c tun.c tun.h cmdline.c cmdline.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -83,7 +85,6 @@ PROGRAMS =  $(bin_PROGRAMS)
 
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 sgsnemu_OBJECTS =  sgsnemu.o tun.o cmdline.o
 sgsnemu_LDADD = $(LDADD)
@@ -335,9 +336,6 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
-cmdline.c: cmdline.ggo
-	gengetopt < cmdline.ggo --unamed-opts --conf-parser
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: