diff --git a/qrenderdoc/qrenderdoc.pro b/qrenderdoc/qrenderdoc.pro
index 7d33da3e2..4306fcfa9 100644
--- a/qrenderdoc/qrenderdoc.pro
+++ b/qrenderdoc/qrenderdoc.pro
@@ -40,6 +40,7 @@ win32 {
 
 	# Link against the core library
 	LIBS += -L$$_PRO_FILE_PWD_/../renderdoc -lrenderdoc
+	QMAKE_LFLAGS += '-Wl,-rpath,\'\$$ORIGIN\''
 
 }
 
diff --git a/renderdoc/os/linux/linux_libentry.cpp b/renderdoc/os/linux/linux_libentry.cpp
index 0e0c6b355..151c847be 100644
--- a/renderdoc/os/linux/linux_libentry.cpp
+++ b/renderdoc/os/linux/linux_libentry.cpp
@@ -42,7 +42,8 @@ void library_loaded()
 	FileIO::GetExecutableFilename(curfile);
 	
 	if(curfile.find("/renderdoccmd") != string::npos ||
-	   curfile.find("/renderdocui") != string::npos)
+	   curfile.find("/renderdocui") != string::npos ||
+	   curfile.find("/qrenderdoc") != string::npos)
 	{
 		RDCDEBUG("Not creating hooks - in replay app");