diff --git a/indra/cmake/BuildVersion.cmake b/indra/cmake/BuildVersion.cmake
index d2981fcd3..271ee864a 100644
--- a/indra/cmake/BuildVersion.cmake
+++ b/indra/cmake/BuildVersion.cmake
@@ -52,6 +52,13 @@ if (DARWIN)
    )
 endif (DARWIN)
 
+if (LINUX)
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh.in
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh
+   )
+endif (LINUX)
+
 # Compose the version.
 set(viewer_VERSION "${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}")
 if (viewer_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh.in
similarity index 97%
rename from indra/newview/linux_tools/wrapper.sh
rename to indra/newview/linux_tools/wrapper.sh.in
index 9dd8caf36..d1fd3104d 100755
--- a/indra/newview/linux_tools/wrapper.sh
+++ b/indra/newview/linux_tools/wrapper.sh.in
@@ -64,7 +64,7 @@ if [ -n "$ASCENDED_DEVELOPER" ]; then
 	elif [ "$ASCENDED_DEVELOPER" = "2" ]; then
 		export LL_WRAPPER='valgrind --smc-check=all --error-limit=no --log-file=secondlife.vg --leak-check=full --suppressions=/usr/lib/valgrind/glibc-2.5.supp --suppressions=secondlife-i686.supp'
 	elif [ "$ASCENDED_DEVELOPER" = "3" ]; then
-		export LL_WRAPPER='strace -f -ff -o singularity.strace'
+		export LL_WRAPPER='strace -f -ff -o ${VIEWER_BRANDING_ID}.strace'
 	fi
 fi
 
@@ -142,7 +142,7 @@ if [ -n "$LL_TCMALLOC" ]; then
     fi
 fi
 
-export VIEWER_BINARY='singularity-do-not-run-directly'
+export VIEWER_BINARY='${VIEWER_BRANDING_ID}-do-not-run-directly'
 BINARY_TYPE=$(expr match "$(file -b bin/$VIEWER_BINARY)" '\(.*executable\)' | sed -e 's/  / /g')
 if [ "${BINARY_TYPE}" == "ELF 64-bit LSB executable" ]; then
 	SL_ENV+='LD_LIBRARY_PATH="`pwd`/lib64:`pwd`/lib32:$LD_LIBRARY_PATH"'