diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 000000000..da7b35942
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,3 @@
+24-01-2012 Jan Kanis
+	* Added a changelog file
+	* removed unescaping if the 'commandline' builtin is called without the -o (tokenise) flag
diff --git a/builtin_commandline.c b/builtin_commandline.c
index f23e1153f..ddcba6ac8 100644
--- a/builtin_commandline.c
+++ b/builtin_commandline.c
@@ -188,7 +188,7 @@ static void write_part( const wchar_t *begin,
 	}
 	else
 	{
-		wchar_t *buff, *esc;
+		wchar_t *buff;
 
 		if( cut_at_cursor )
 		{
@@ -196,14 +196,12 @@ static void write_part( const wchar_t *begin,
 		}
 
 		buff = wcsndup( begin, end-begin );
-		esc = unescape( buff, UNESCAPE_INCOMPLETE );
 
 //		debug( 0, L"woot2 %ls -> %ls", buff, esc );
 
-		sb_append( sb_out, esc );
+		sb_append( sb_out, buff );
 		sb_append( sb_out, L"\n" );
 
-		free( esc );
 		free( buff );
 
 	}