diff --git a/indra/cmake/Python.cmake b/indra/cmake/Python.cmake
index 06634cb5d..9f24361f4 100644
--- a/indra/cmake/Python.cmake
+++ b/indra/cmake/Python.cmake
@@ -30,8 +30,8 @@ if (WINDOWS)
       )
   endif()
 
-elseif (EXISTS /etc/arch-release)
-  # On Archlinux, use Python 2
+elseif (EXISTS /usr/bin/python2)
+  # if this is there, use it
 
   find_program(PYTHON_EXECUTABLE python2 PATHS /usr/bin)
 
diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py
index 210e43b23..9c7d2f563 100644
--- a/indra/cmake/run_build_test.py
+++ b/indra/cmake/run_build_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 """\
 @file   run_build_test.py
 @author Nat Goodspeed
diff --git a/indra/copy_win_scripts/start-client.py b/indra/copy_win_scripts/start-client.py
index 5699f5273..63c765c2f 100644
--- a/indra/copy_win_scripts/start-client.py
+++ b/indra/copy_win_scripts/start-client.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 """\
 @file   start-client.py
 
diff --git a/indra/lib/python/indra/util/test_win32_manifest.py b/indra/lib/python/indra/util/test_win32_manifest.py
index 0532cb006..9863b9777 100644
--- a/indra/lib/python/indra/util/test_win32_manifest.py
+++ b/indra/lib/python/indra/util/test_win32_manifest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 """\
 @file test_win32_manifest.py
 @brief Test an assembly binding version and uniqueness in a windows dll or exe.  
diff --git a/indra/llmessage/tests/test_llsdmessage_peer.py b/indra/llmessage/tests/test_llsdmessage_peer.py
index 22edd9dad..a81399a33 100644
--- a/indra/llmessage/tests/test_llsdmessage_peer.py
+++ b/indra/llmessage/tests/test_llsdmessage_peer.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 """\
 @file   test_llsdmessage_peer.py
 @author Nat Goodspeed
diff --git a/indra/llmessage/tests/testrunner.py b/indra/llmessage/tests/testrunner.py
index f2c841532..4c89b11b5 100644
--- a/indra/llmessage/tests/testrunner.py
+++ b/indra/llmessage/tests/testrunner.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 """\
 @file   testrunner.py
 @author Nat Goodspeed
diff --git a/indra/newview/generate_breakpad_symbols.py b/indra/newview/generate_breakpad_symbols.py
index d351c406b..2fc5abe8b 100644
--- a/indra/newview/generate_breakpad_symbols.py
+++ b/indra/newview/generate_breakpad_symbols.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 """\
 @file generate_breakpad_symbols.py
 @author Brad Kittenbrink <brad@lindenlab.com>
diff --git a/indra/newview/linux_tools/handle_secondlifeprotocol.sh.in b/indra/newview/linux_tools/handle_secondlifeprotocol.sh.in
index 770f7ae37..078cee2ed 100755
--- a/indra/newview/linux_tools/handle_secondlifeprotocol.sh.in
+++ b/indra/newview/linux_tools/handle_secondlifeprotocol.sh.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Send a URL of the form secondlife://... to Second Life.
 #
diff --git a/indra/newview/linux_tools/install.sh.in b/indra/newview/linux_tools/install.sh.in
index 2d42c13dd..2136c3808 100755
--- a/indra/newview/linux_tools/install.sh.in
+++ b/indra/newview/linux_tools/install.sh.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Install @VIEWER_CHANNEL@. This script can install the viewer both
 # system-wide and for an individual user.
diff --git a/indra/newview/linux_tools/launch_url.sh b/indra/newview/linux_tools/launch_url.sh
index c528ee762..c1effc188 100755
--- a/indra/newview/linux_tools/launch_url.sh
+++ b/indra/newview/linux_tools/launch_url.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script loads a web page in the 'default' graphical web browser.
 # It MUST return immediately (or soon), so the browser should be
diff --git a/indra/newview/linux_tools/refresh_desktop_app_entry.sh.in b/indra/newview/linux_tools/refresh_desktop_app_entry.sh.in
index 122007320..109dfe38f 100755
--- a/indra/newview/linux_tools/refresh_desktop_app_entry.sh.in
+++ b/indra/newview/linux_tools/refresh_desktop_app_entry.sh.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 SCRIPTSRC=`readlink -f "$0" || echo "$0"`
 RUN_PATH=`dirname "${SCRIPTSRC}" || echo .`
diff --git a/indra/newview/linux_tools/register_secondlifeprotocol.sh b/indra/newview/linux_tools/register_secondlifeprotocol.sh
index 16e73cb85..d7ce56c49 100755
--- a/indra/newview/linux_tools/register_secondlifeprotocol.sh
+++ b/indra/newview/linux_tools/register_secondlifeprotocol.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Register a protocol handler (default: handle_secondlifeprotocol.sh) for
 # URLs of the form secondlife://...
diff --git a/indra/newview/linux_tools/wrapper.sh.in b/indra/newview/linux_tools/wrapper.sh.in
index 4baefb913..7ccee7eab 100755
--- a/indra/newview/linux_tools/wrapper.sh.in
+++ b/indra/newview/linux_tools/wrapper.sh.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ## Here are some configuration options for Linux Client Testers.
 ## These options are for self-assisted troubleshooting during this beta
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 956a6d767..972025113 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 """\
 @file viewer_manifest.py
 @author Ryan Williams
diff --git a/indra/test/test_llmanifest.py b/indra/test/test_llmanifest.py
index e645c8891..c9afe19d1 100644
--- a/indra/test/test_llmanifest.py
+++ b/indra/test/test_llmanifest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 """
 @file test_llmanifest.py
 @author Ryan Williams
diff --git a/scripts/check_xml.sh b/scripts/check_xml.sh
index f093aa886..42db8fab1 100755
--- a/scripts/check_xml.sh
+++ b/scripts/check_xml.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 SAVEDIR=`pwd`
 
diff --git a/scripts/clean_translation.sh b/scripts/clean_translation.sh
index 39e431d47..ed06355c8 100755
--- a/scripts/clean_translation.sh
+++ b/scripts/clean_translation.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 SAVEDIR=`pwd`
 
diff --git a/scripts/repackage.sh b/scripts/repackage.sh
index 59e71173f..55ba43240 100755
--- a/scripts/repackage.sh
+++ b/scripts/repackage.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #(C) 2011 SIANA GEARZ
 
 usage() {
diff --git a/scripts/setup-path.py b/scripts/setup-path.py
index 157bda002..e0d61d29d 100755
--- a/scripts/setup-path.py
+++ b/scripts/setup-path.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 """\
 @file setup-path.py
 @brief Get the python library directory in the path, so we don't have
diff --git a/scripts/template_verifier.py b/scripts/template_verifier.py
index 8d8c49fe0..1663e6aaa 100755
--- a/scripts/template_verifier.py
+++ b/scripts/template_verifier.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 """\
 @file template_verifier.py
 @brief Message template compatibility verifier.
diff --git a/scripts/update_source_contributors.py b/scripts/update_source_contributors.py
index a37a6b2dc..f5ad9e550 100755
--- a/scripts/update_source_contributors.py
+++ b/scripts/update_source_contributors.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 # -*- coding: UTF-8 -*-
 """\
 @file update_source_contributors.py