2 files changed, 9 insertions, 0 deletions
diff --git a/.env b/.env
new file mode 100644
index 00000000..7f847e29
--- /dev/null
+++ b/.env
@@ -0,0 +1,5 @@
+DIR=`dirname $0`
+if [ -z "$VIRTUAL_ENV" ] && [ -f $DIR/../venv.mitmproxy/bin/activate ]; then
+    echo "Activating mitmproxy virtualenv..."
+    source $DIR/../venv.mitmproxy/bin/activate
+fi
diff --git a/README.mkd b/README.mkd
index ca412e6f..b5453c22 100644
--- a/README.mkd
+++ b/README.mkd
@@ -75,6 +75,10 @@ command:
 
 ```$ mitmdump --version```
 
+For convenience, the project includes an
+[autoenv](https://github.com/kennethreitz/autoenv) file
+([.env](https://github.com/mitmproxy/mitmproxy/blob/master/.env)) that
+auto-activates the virtualenv when you cd into the mitmproxy directory.
 
 
 ### Testing