diff --git a/bin/cdist b/bin/cdist
index bb6e38fa..6da7d04c 100755
--- a/bin/cdist
+++ b/bin/cdist
@@ -99,7 +99,7 @@ def banner():
 class Cdist:
    """Cdist main class to hold arbitrary data"""
 
-   def __init__(self, target_host, initial_manifest=False, remote_user="root"):
+   def __init__(self, target_host, initial_manifest=False, remote_user="root", home=None):
       self.target_host = target_host
       self.remote_prefix = ["ssh", "root@" + self.target_host]
 
@@ -593,6 +593,9 @@ if __name__ == "__main__":
    parser.add_argument('-b', '--banner',
        help='Show cdist banner',
        action='store_true', dest='banner')
+   parser.add_argument('-c', '--cdist-home',
+       help='Change cdist home (default: .. from bin directory)',
+       action='store_true', dest='cdist_home')
    parser.add_argument('-d', '--debug', help='Set log level to debug',
        action='store_true')
    parser.add_argument('-i', '--initial-manifest', 
@@ -617,7 +620,7 @@ if __name__ == "__main__":
       log.debug(args)
 
       for host in args.host:
-         c = Cdist(host, initial_manifest=args.manifest)
+         c = Cdist(host, initial_manifest=args.manifest, home=args.cdist_home)
          c.deploy_to()
          c.cleanup()
    except KeyboardInterrupt:
diff --git a/doc/dev/todo/TAKEME b/doc/dev/todo/TAKEME
index e67469ce..5439a1b9 100644
--- a/doc/dev/todo/TAKEME
+++ b/doc/dev/todo/TAKEME
@@ -44,5 +44,3 @@ DOCUMENTATION
 - asciidoc interprets __, which we use for variables
   names -> seek through docs and replace with \_\_!
 - reference explorers in cdist-reference!
-- compare running times:
-   one, 5, 10, 50, 100, 1000 hosts => how does cdist scale?
diff --git a/doc/dev/todo/niconext b/doc/dev/todo/niconext
index a4c23e8b..f8535c07 100644
--- a/doc/dev/todo/niconext
+++ b/doc/dev/todo/niconext
@@ -1,2 +1,6 @@
+- Remove all FIXME entries
+- Write cdist-manpage
+- Remove obsolete manpages
+- Support different home instead of ../
 - Bug: os.path.join() may be wrong for the remote side!
    -> does not matter for now!