diff --git a/docs/changelog.rst b/docs/changelog.rst
index 33f7dc1..c0edfce 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,3 +1,13 @@
+0.6.1 (xxxxxxx)
+---------------------------
+
+Fixed bugs
+******************
+
+- updated tests for Python 2.7
+- added if main condition for manage.py script
+- fixed case sensitivity in setup.py dependencies
+
 0.6 (11.07.2010)
 ---------------------------
 
diff --git a/migrate/versioning/templates/manage.py_tmpl b/migrate/versioning/templates/manage.py_tmpl
index 93bcba2..e6fc4ba 100644
--- a/migrate/versioning/templates/manage.py_tmpl
+++ b/migrate/versioning/templates/manage.py_tmpl
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
 from migrate.versioning.shell import main
 
-main(%(defaults)s)
+if __name__ == '__main__':
+    main(%(defaults)s)