diff --git a/tools/Makefile.am b/tools/Makefile.am
index fc210a1046..d203155426 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,4 +1,4 @@
 bin_PROGRAMS = gstreamer-launch gstreamer-register gstreamer-inspect
 
-LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
-INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
+LDADD = $(GST_LIBS)
+
diff --git a/tools/gstreamer-launch.c b/tools/gstreamer-launch.c
index ef06966084..1c5ae6ddda 100644
--- a/tools/gstreamer-launch.c
+++ b/tools/gstreamer-launch.c
@@ -16,7 +16,7 @@ int main(int argc,char *argv[]) {
 
   // make a null-terminated version of argv
   argvn = g_new0(char *,argc);
-  memcpy(argvn,argv+1,sizeof(char*)*argc);
+  memcpy(argvn,argv+1,sizeof(char*)*(argc-1));
   // join the argvs together
   cmdline = g_strjoinv(" ",argvn);
   // free the null-terminated argv