diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt
index fb9b193bd..9d27bfffe 100644
--- a/qrenderdoc/CMakeLists.txt
+++ b/qrenderdoc/CMakeLists.txt
@@ -26,7 +26,7 @@ endif()
 if(STATIC_QRENDERDOC)
     set(QMAKE_CXXFLAGS "-DSTATIC_QRENDERDOC=1")
     set(QMAKE_CONFIG "debug static")
-    set(QMAKE_LDFLAGS "-static-libstdc++ -lutil")
+    set(QMAKE_LDFLAGS "-lutil")
 endif()
 
 if(NOT APPLE)
diff --git a/util/LINUX_DIST_README b/util/LINUX_DIST_README
index 2d3bda64e..6fde4c886 100644
--- a/util/LINUX_DIST_README
+++ b/util/LINUX_DIST_README
@@ -34,11 +34,18 @@ Requirements:
 These should be available on any system with X installed. You can always
 build RenderDoc yourself from source. For more information, github.
 
-To run qrenderdoc, Qt is statically linked two additional system
+To run qrenderdoc, Qt is statically linked but additional system
 libraries are needed:
 
-* libfontconfig
-* libfreetype
+* libstdc++ >= 6.0.21 (from GCC 5.x)
+* libfontconfig1 >= 2.11.0
+* libfreetype6 >= 2.4.8
+* libproxy >= 0.4.7
+
+If you get errors on run about missing GLIBCXX symbols then you likely
+haven't met the libstdc++ requirement and will need to either find a
+package in your distribution to install gcc 5.x, or else compile
+RenderDoc from source (though you will still need gcc-5 to compile).
 
 Vulkan Layer registration:
 --------------------------
diff --git a/util/buildscripts/scripts/compile_docker.sh b/util/buildscripts/scripts/compile_docker.sh
index e3a413001..e1f7d2ccf 100755
--- a/util/buildscripts/scripts/compile_docker.sh
+++ b/util/buildscripts/scripts/compile_docker.sh
@@ -7,7 +7,7 @@ rm -rf /io/*
 cd /
 mkdir renderdoc_build
 cd renderdoc_build
-CC=clang CXX=clang++ CFLAGS="-fPIC -fvisibility=hidden" LDFLAGS="-static-libstdc++" cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/io/dist/ -DVULKAN_LAYER_FOLDER=/io/dist/etc/vulkan/implicit_layer.d -DSTATIC_QRENDERDOC=ON -DQRENDERDOC_NO_CXX11_REGEX=ON /renderdoc
+CC=clang CXX=clang++ CFLAGS="-fPIC -fvisibility=hidden" cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/io/dist/ -DVULKAN_LAYER_FOLDER=/io/dist/etc/vulkan/implicit_layer.d -DSTATIC_QRENDERDOC=ON -DQRENDERDOC_NO_CXX11_REGEX=ON /renderdoc
 make -j8
 make install
 
diff --git a/util/buildscripts/scripts/docker/prepare.sh b/util/buildscripts/scripts/docker/prepare.sh
index bcef89d88..a02582021 100755
--- a/util/buildscripts/scripts/docker/prepare.sh
+++ b/util/buildscripts/scripts/docker/prepare.sh
@@ -16,7 +16,7 @@ wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
 apt-get update
 
 # install dependencies
-apt-get install --force-yes -y libx11-dev libx11-xcb-dev mesa-common-dev libgl1-mesa-dev gcc g++ clang-3.8 clang++-3.8 make pkg-config git libcurl4-openssl-dev libpcre3-dev libstdc++-6-dev
+apt-get install --force-yes -y libx11-dev libx11-xcb-dev mesa-common-dev libgl1-mesa-dev gcc-5 g++-5 clang-3.8 clang++-3.8 make pkg-config git libcurl4-openssl-dev libpcre3-dev
 
 # install dependencies for building qt
 apt-get install --force-yes -y libproxy-dev autoconf autogen libtool xutils-dev bison