diff --git a/bin/cdist-quickstart b/bin/cdist-quickstart
index e853e5ee..781c1b45 100755
--- a/bin/cdist-quickstart
+++ b/bin/cdist-quickstart
@@ -248,3 +248,18 @@ __prompt "Press enter to run \"$cmd\""
 
 # No quotes, we need field splitting
 $cmd
+
+################################################################################
+# End
+#
+
+cat << eof
+
+That's it, this is the end of the cdist-introduction.
+
+I hope you've got some impression on how cdist works, here are again some
+pointers on where to continue to read:
+
+cdist(7), cdist-deploy-to(1), cdist-type(7), cdist-stages(7)
+
+eof
diff --git a/doc/dev/todo/niconext b/doc/dev/todo/niconext
index 5fec3d29..ce5c9c60 100644
--- a/doc/dev/todo/niconext
+++ b/doc/dev/todo/niconext
@@ -1,5 +1,3 @@
 Prepare documentation for 1.0.0.
    - Check all references in manpages
-      - cdist.text, cdist-quickstart
-         - write cdist-quickstart
-            - fix cdist-config / version on remote!
+      - cdist.text