diff --git a/mitter b/mitter
index 7c13eed..122a031 100755
--- a/mitter
+++ b/mitter
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Mitter, a Maemo client for Twitter.
diff --git a/mitterlib/__init__.py b/mitterlib/__init__.py
index 7161516..160d3f5 100644
--- a/mitterlib/__init__.py
+++ b/mitterlib/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Mitter, a Maemo client for Twitter.
diff --git a/mitterlib/constants.py b/mitterlib/constants.py
index 3e25de4..612ebce 100644
--- a/mitterlib/constants.py
+++ b/mitterlib/constants.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Mitter, a simple client for Twitter.
diff --git a/mitterlib/network/__init__.py b/mitterlib/network/__init__.py
index 77fb5d1..5ae18a3 100644
--- a/mitterlib/network/__init__.py
+++ b/mitterlib/network/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Mitter, a simple client for Twitter
diff --git a/mitterlib/network/networkbase.py b/mitterlib/network/networkbase.py
index 67d450e..87e90e7 100644
--- a/mitterlib/network/networkbase.py
+++ b/mitterlib/network/networkbase.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Mitter, a client for Twitter.
diff --git a/mitterlib/network/twitter.py b/mitterlib/network/twitter.py
index 6a69ffb..5aac5d3 100644
--- a/mitterlib/network/twitter.py
+++ b/mitterlib/network/twitter.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Mitter, a client for Twitter.
diff --git a/mitterlib/ui/__init__.py b/mitterlib/ui/__init__.py
index 0c673a5..ab231ec 100644
--- a/mitterlib/ui/__init__.py
+++ b/mitterlib/ui/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Mitter, a simple client for Twitter
diff --git a/mitterlib/ui/helpers/console_utils.py b/mitterlib/ui/helpers/console_utils.py
index cf4a9cb..62aa9de 100644
--- a/mitterlib/ui/helpers/console_utils.py
+++ b/mitterlib/ui/helpers/console_utils.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Mitter, a Maemo client for Twitter.
diff --git a/mitterlib/ui/helpers/image_helpers.py b/mitterlib/ui/helpers/image_helpers.py
index 24a9459..aecb8bb 100644
--- a/mitterlib/ui/helpers/image_helpers.py
+++ b/mitterlib/ui/helpers/image_helpers.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Mitter, a Maemo client for Twitter.
diff --git a/mitterlib/ui/helpers/notify.py b/mitterlib/ui/helpers/notify.py
index 08b198b..3abea03 100644
--- a/mitterlib/ui/helpers/notify.py
+++ b/mitterlib/ui/helpers/notify.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Mitter, a Maemo client for Twitter.
diff --git a/mitterlib/ui/helpers/timesince.py b/mitterlib/ui/helpers/timesince.py
index 2f2c69d..da9c1db 100644
--- a/mitterlib/ui/helpers/timesince.py
+++ b/mitterlib/ui/helpers/timesince.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Mitter, a Maemo client for Twitter.
diff --git a/mitterlib/ui/ui_cmd.py b/mitterlib/ui/ui_cmd.py
index 53bba10..1170681 100644
--- a/mitterlib/ui/ui_cmd.py
+++ b/mitterlib/ui/ui_cmd.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Mitter, micro-blogging client
diff --git a/mitterlib/ui/ui_pygtk.py b/mitterlib/ui/ui_pygtk.py
index 2eb5869..c7fff3e 100644
--- a/mitterlib/ui/ui_pygtk.py
+++ b/mitterlib/ui/ui_pygtk.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Mitter, a Maemo client for Twitter.
diff --git a/mitterlib/ui/ui_tty.py b/mitterlib/ui/ui_tty.py
index ea89116..ec60626 100644
--- a/mitterlib/ui/ui_tty.py
+++ b/mitterlib/ui/ui_tty.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Mitter, a Maemo client for Twitter.
diff --git a/mitterlib/ui/ui_zork.py b/mitterlib/ui/ui_zork.py
index 50ed6d9..98c5ec9 100644
--- a/mitterlib/ui/ui_zork.py
+++ b/mitterlib/ui/ui_zork.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Mitter, micro-blogging client
diff --git a/tests.py b/tests.py
index 698f13f..b8c2902 100644
--- a/tests.py
+++ b/tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 import unittest