diff --git a/debian/changelog b/debian/changelog
index a933f43f..e73f25d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,11 @@ byobu (5.31) unreleased; urgency=low
     - use a smarter algorithm for estimating ec2 cost
     - include ec2instancespricing.py from
       https://github.com/erans/ec2instancespricing
+  * debian/postinst, usr/bin/byobu-config, usr/bin/byobu-select-session,
+    usr/lib/byobu/include/ec2instancespricing.py: LP: #996559
+    - use env for shebang in development tree
+    - fix this up in the postinst
+      + seems racy -- there's got to better way of handling this???
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 28 Jan 2013 02:21:15 -0600
 
diff --git a/debian/postinst b/debian/postinst
index a77080a2..f4f91c2c 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -12,6 +12,9 @@ else
 	rm -f /etc/profile.d/Z98-$PKG.sh
 fi
 
+# Replace the development tree's "/usr/bin/env python" shebang
+sed -i -e "s:^#!/usr/bin/env python:#!/usr/bin/python:" /usr/bin/byobu-config /usr/bin/byobu-select-session /usr/lib/byobu/include/ec2instancespricing.py
+
 # Clean up any old-school screen-profiles diversions of /usr/bin/screen
 if [ -f /usr/bin/screen ] && [ -f /usr/bin/screen.real ]; then
 	divertpkg=$(dpkg-divert --listpackage /usr/bin/screen || true)
diff --git a/usr/bin/byobu-config b/usr/bin/byobu-config
index 2c7ca317..3cbf87e4 100755
--- a/usr/bin/byobu-config
+++ b/usr/bin/byobu-config
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 #    byobu-config
 #    Copyright (C) 2008 Canonical Ltd.
diff --git a/usr/bin/byobu-select-session b/usr/bin/byobu-select-session
index e0446478..fe58ae82 100755
--- a/usr/bin/byobu-select-session
+++ b/usr/bin/byobu-select-session
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 #    byobu-select-session
 #    Copyright (C) 2010 Canonical Ltd.
diff --git a/usr/lib/byobu/include/ec2instancespricing.py b/usr/lib/byobu/include/ec2instancespricing.py
index 7f036232..25f2950d 100755
--- a/usr/lib/byobu/include/ec2instancespricing.py
+++ b/usr/lib/byobu/include/ec2instancespricing.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Copyright (c) 2012 Eran Sandler (eran@sandler.co.il),  http://eran.sandler.co.il,  http://forecastcloudy.net
 #