diff --git a/bolt/core.py b/bolt/core.py
index 1e9e1de..87e37c8 100644
--- a/bolt/core.py
+++ b/bolt/core.py
@@ -1231,6 +1231,9 @@ def init_task_runner(filename, cwd):
             path = join(cwd, filename)
             if exists(path):
                 break
+            elif filename == "Boltfile" and exists(join(cwd, "boltfile.py")):
+                path = join(cwd, "boltfile.py")
+                break
             prev = cwd
             cwd = dirname(cwd)
 
@@ -1406,7 +1409,7 @@ def main(argv=None):
 
     op.add_option(
         '-f', dest='file', default="Boltfile",
-        help="set the name or path of the bolt file [Boltfile]"
+        help="set the name or path of the bolt file [Boltfile or boltfile.py]"
         )
 
     op.add_option(