diff --git a/indra/newview/fsdata.cpp b/indra/newview/fsdata.cpp
index 96d9e84233..d54f04cb68 100644
--- a/indra/newview/fsdata.cpp
+++ b/indra/newview/fsdata.cpp
@@ -940,7 +940,9 @@ LLSD FSData::getSystemInfo()
 	sysinfo2 += llformat("libcurl Version: %s\n", info["LIBCURL_VERSION"].asString().c_str());
 	sysinfo2 += llformat("J2C Decoder Version: %s\n", info["J2C_VERSION"].asString().c_str());
 	sysinfo2 += llformat("Audio Driver Version: %s\n", info["AUDIO_DRIVER_VERSION"].asString().c_str());
-	sysinfo2 += llformat("Qt Webkit Version: %s\n", info["QT_WEBKIT_VERSION"].asString().c_str());
+	sysinfo2 += llformat("CEF Version: %s\n", info["LLCEFLIB_VERSION"].asString().c_str());
+	sysinfo2 += llformat("LibVLC Version: %s\n", info["LIBVLC_VERSION"].asString().c_str());
+
 	sysinfo2 += llformat("Vivox Version: %s\n", info["VOICE_VERSION"].asString().c_str());
 	sysinfo2 += llformat("Packets Lost: %.0f/%.0f (%.1f%%)\n\n", info["PACKETS_LOST"].asReal(), info["PACKETS_IN"].asReal(), info["PACKETS_PCT"].asReal());
 
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 3dae6d9b8e..d850fed445 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -140,7 +140,7 @@
 #include "llexception.h"
 //#if !LL_LINUX
 #include "cef/llceflib.h"
-#if LL_WINDOWS
+#if defined(LL_WINDOWS) || defined(LL_LINUX)
 #include "vlc/libvlc_version.h"
 #endif // LL_WINDOWS
 //#endif
@@ -3970,7 +3970,7 @@ LLSD LLAppViewer::getViewerInfo() const
 //
 //#endif
 
-#if LL_WINDOWS
+#if defined(LL_WINDOWS) || defined(LL_LINUX)
 	std::ostringstream ver_codec;
 	ver_codec << LIBVLC_VERSION_MAJOR;
 	ver_codec << ".";