diff --git a/services/clipboard/sugar-clipboard b/services/clipboard/sugar-clipboard
index 3f7ef9f2..acc86571 100755
--- a/services/clipboard/sugar-clipboard
+++ b/services/clipboard/sugar-clipboard
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # vi: ts=4 ai noet 
 #
 # Copyright (C) 2006, Red Hat, Inc.
diff --git a/services/console/interface/logviewer/logviewer.py b/services/console/interface/logviewer/logviewer.py
index 6bd4543c..43d801ad 100644
--- a/services/console/interface/logviewer/logviewer.py
+++ b/services/console/interface/logviewer/logviewer.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Copyright (C) 2006, Red Hat, Inc.
 #
diff --git a/services/console/interface/terminal/terminal.py b/services/console/interface/terminal/terminal.py
index a5649ada..e38538e5 100644
--- a/services/console/interface/terminal/terminal.py
+++ b/services/console/interface/terminal/terminal.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Copyright (C) 2006, Red Hat, Inc.
 #
diff --git a/services/datastore/sugar-data-store b/services/datastore/sugar-data-store
index 823dbe08..63449524 100755
--- a/services/datastore/sugar-data-store
+++ b/services/datastore/sugar-data-store
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # vi: ts=4 ai noet 
 #
 # Copyright (C) 2006, Red Hat, Inc.
diff --git a/services/nm/sugar-nm-applet b/services/nm/sugar-nm-applet
index c84e8044..5671d5ab 100644
--- a/services/nm/sugar-nm-applet
+++ b/services/nm/sugar-nm-applet
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # vi: ts=4 ai noet 
 #
 # Copyright (C) 2006, Red Hat, Inc.
diff --git a/services/presence/sugar-presence-service b/services/presence/sugar-presence-service
index 143d04ae..b98db9a6 100755
--- a/services/presence/sugar-presence-service
+++ b/services/presence/sugar-presence-service
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # vi: ts=4 ai noet 
 #
 # Copyright (C) 2006, Red Hat, Inc.
diff --git a/shell/sugar-activity b/shell/sugar-activity
index 43b56dc8..3f3c93fb 100755
--- a/shell/sugar-activity
+++ b/shell/sugar-activity
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Copyright (C) 2006, Red Hat, Inc.
 #
diff --git a/shell/sugar-activity-factory b/shell/sugar-activity-factory
index 2dc8c3b5..1762e39a 100755
--- a/shell/sugar-activity-factory
+++ b/shell/sugar-activity-factory
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Copyright (C) 2006, Red Hat, Inc.
 #
diff --git a/shell/sugar-shell b/shell/sugar-shell
index 67c80291..4eaccf51 100755
--- a/shell/sugar-shell
+++ b/shell/sugar-shell
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Copyright (C) 2006, Red Hat, Inc.
 #
diff --git a/sugar-emulator b/sugar-emulator
index 56ee7966..aeb54432 100755
--- a/sugar-emulator
+++ b/sugar-emulator
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Copyright (C) 2006, Red Hat, Inc.
 #
diff --git a/sugar-emulator-shutdown b/sugar-emulator-shutdown
index c608d970..75f6de08 100755
--- a/sugar-emulator-shutdown
+++ b/sugar-emulator-shutdown
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Copyright (C) 2006, Red Hat, Inc.
 #
diff --git a/sugar/activity/bundlebuilder.py b/sugar/activity/bundlebuilder.py
index 05c48a2a..a2e338fb 100644
--- a/sugar/activity/bundlebuilder.py
+++ b/sugar/activity/bundlebuilder.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Copyright (C) 2006, Red Hat, Inc.
 #
diff --git a/tests/simulator/simulator b/tests/simulator/simulator
index d720d916..838d645b 100755
--- a/tests/simulator/simulator
+++ b/tests/simulator/simulator
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Copyright (C) 2006, Red Hat, Inc.
 #
diff --git a/tests/test-browser.py b/tests/test-browser.py
index 969efab7..13001ec3 100755
--- a/tests/test-browser.py
+++ b/tests/test-browser.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Copyright (C) 2006, Red Hat, Inc.
 #
diff --git a/tests/test-datastore.py b/tests/test-datastore.py
index b0ab9339..d3e84781 100755
--- a/tests/test-datastore.py
+++ b/tests/test-datastore.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (C) 2006, Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/tests/test-snowflake-box.py b/tests/test-snowflake-box.py
index d56993b0..dd703934 100755
--- a/tests/test-snowflake-box.py
+++ b/tests/test-snowflake-box.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Copyright (C) 2006, Red Hat, Inc.
 #
diff --git a/tests/test-spread-box.py b/tests/test-spread-box.py
index 0f138ccf..dc4e73eb 100755
--- a/tests/test-spread-box.py
+++ b/tests/test-spread-box.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Copyright (C) 2006, Red Hat, Inc.
 #
diff --git a/tests/test-theme.py b/tests/test-theme.py
index d71103d7..eae835fc 100755
--- a/tests/test-theme.py
+++ b/tests/test-theme.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Copyright (C) 2006, Red Hat, Inc.
 #
diff --git a/tests/test-window-manager.py b/tests/test-window-manager.py
index dff2b98c..539979de 100644
--- a/tests/test-window-manager.py
+++ b/tests/test-window-manager.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Copyright (C) 2006, Red Hat, Inc.
 #
diff --git a/tools/hex-colors-to-dict b/tools/hex-colors-to-dict
index babb4836..12138b1b 100755
--- a/tools/hex-colors-to-dict
+++ b/tools/hex-colors-to-dict
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 import sys
 
diff --git a/tools/nicks-to-list b/tools/nicks-to-list
index d4116be7..b140b4ca 100755
--- a/tools/nicks-to-list
+++ b/tools/nicks-to-list
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 import sys
 
diff --git a/tools/sugar-setup-activity.in b/tools/sugar-setup-activity.in
index a3ea08ef..54598533 100644
--- a/tools/sugar-setup-activity.in
+++ b/tools/sugar-setup-activity.in
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 import sys
 
 from sugar import setup