diff --git a/cdist/shell.py b/cdist/shell.py
index d45b50e0..f4abbdd3 100644
--- a/cdist/shell.py
+++ b/cdist/shell.py
@@ -84,6 +84,5 @@ class Shell(object):
 
     @classmethod
     def commandline(cls, args):
-        print(os.environ['PYTHONPATH'])
         shell = cls(args.shell)
         shell.run()
diff --git a/docs/changelog b/docs/changelog
index 9e1279ba..0d37e011 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -4,6 +4,9 @@ Changelog
 	* Changes are always commented with their author in (braces)
 	* Exception: No braces means author == Nico Schottelius
 
+2.3.0:
+	* Core: Added support for cdist shell
+
 2.2.0: 2013-07-12
 	* Build: Cleanup the Makefile
 	* Type __package_opkg: Use shortcut version
diff --git a/docs/man/cdist-reference.text.sh b/docs/man/cdist-reference.text.sh
index 7ee2224a..b0a9d32c 100755
--- a/docs/man/cdist-reference.text.sh
+++ b/docs/man/cdist-reference.text.sh
@@ -179,13 +179,13 @@ ENVIRONMENT VARIABLES
 ---------------------
 __explorer::
     Directory that contains all global explorers.
-    Available for: initial manifest, explorer, type explorer
+    Available for: initial manifest, explorer, type explorer, shell
 __manifest::
     Directory that contains the initial manifest.
-    Available for: initial manifest, type manifest
+    Available for: initial manifest, type manifest, shell
 __global::
     Directory that contains generic output like explorer.
-    Available for: initial manifest, type manifest, type gencode
+    Available for: initial manifest, type manifest, type gencode, shell
 __object::
     Directory that contains the current object.
     Available for: type manifest, type explorer, type gencode
@@ -200,7 +200,7 @@ __object_name::
     Available for: type manifest, type explorer, type gencode
 __target_host::
     The host we are deploying to.
-    Available for: explorer, initial manifest, type explorer, type manifest, type gencode
+    Available for: explorer, initial manifest, type explorer, type manifest, type gencode, shell
 __type::
     Path to the current type.
     Available for: type manifest, type gencode
@@ -216,6 +216,6 @@ SEE ALSO
 
 COPYING
 -------
-Copyright \(C) 2011-2012 Nico Schottelius. Free use of this software is
+Copyright \(C) 2011-2013 Nico Schottelius. Free use of this software is
 granted under the terms of the GNU General Public License version 3 (GPLv3).
 eof