diff --git a/renderdoccmd/Makefile b/renderdoccmd/Makefile
index c7d27cae2..c31957f03 100644
--- a/renderdoccmd/Makefile
+++ b/renderdoccmd/Makefile
@@ -5,9 +5,9 @@ MACROS=-DLINUX \
 			 -DRENDERDOC_EXPORTS \
 			 -DGIT_COMMIT_HASH='"'$$(git rev-parse HEAD)'"' \
 			 -DRENDERDOC_VERSION_STRING='"0.20"'
-CFLAGS=-c -Wall -Werror -fPIC $(MACROS) -I.
+CFLAGS=-c -Wall -Werror -fPIC $(MACROS) -I../renderdoc/
 CPPFLAGS=-std=c++11 -g -Wno-unused -Wno-unknown-pragmas -Wno-reorder
-LDFLAGS=-L../renderdoc -lrenderdoc
+LDFLAGS=-L../renderdoc -lrenderdoc -lGL
 OBJECTS=linux_specific.o
 
 all: bin/renderdoccmd
diff --git a/renderdoccmd/linux_specific.cpp b/renderdoccmd/linux_specific.cpp
index d9fb558fe..525ca40a9 100644
--- a/renderdoccmd/linux_specific.cpp
+++ b/renderdoccmd/linux_specific.cpp
@@ -23,9 +23,19 @@
  ******************************************************************************/
 
 #include <stdio.h>
+#include <replay/renderdoc.h>
+
+// symbol defined in libGL but not librenderdoc.
+// Forces link of libGL after renderdoc (otherwise all symbols would
+// be resolved and libGL wouldn't link, meaning dlsym(RTLD_NEXT) would fai
+extern "C" void glXWaitGL();
 
 int main()
 {
-	puts("foo");
+	RENDERDOC_SpawnReplayHost(NULL);
+
+	volatile bool never_run = false;
+	if(never_run) glXWaitGL();
+
 	return 0;
 }