diff --git a/ChangeLog b/ChangeLog
index b4504d8..5d15b01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-04 Jesse van den Kieboom <jesse@icecrew.nl>
+        * VERSION CHANGED TO 2.0.6
+        * gnoemoe/gm-world.c: do not log LOG_OUT when not logged in
+        * gnoemoe/mcp/gm-mcp-session.[ch]: added initialized function
+        
 2006-08-04 Jesse van den Kieboom <jesse@icecrew.nl>
         * gnoemoe/gm-editor.c: improved editor name generation, no longer
           open files O_EXCL
diff --git a/README b/README
index 1b59208..75ffb02 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is version 2.0.5 of gnoemoe. gnoemoe is a Gnome MOO Client.
+This is version 2.0.6 of gnoemoe. gnoemoe is a Gnome MOO Client.
 
 GnoeMoe is a full featured Gnome MOO (MUD Object Oriented) Client which aims at 
 integrating in the Gnome desktop as nice as possible adhering the Gnome 
@@ -42,7 +42,7 @@ The official web site is:
 
 You can download the latest gnoemoe tarball from the web site:
 
-    http://www.icecrew.nl/software/gnoemoe/download/gnoemoe-2.0.5.tar.gz
+    http://www.icecrew.nl/software/gnoemoe/download/gnoemoe-2.0.6.tar.gz
 
 Installation
 ============
@@ -57,8 +57,8 @@ gnoemoe requires:
 
 Simple install procedure:
 
-  % gzip -cd gnoemoe-2.0.5.tar.gz | tar xvf - 	# unpack the sources
-  % cd gnoemoe-2.0.5				# change to the toplevel directory
+  % gzip -cd gnoemoe-2.0.6.tar.gz | tar xvf - 	# unpack the sources
+  % cd gnoemoe-2.0.6				# change to the toplevel directory
   % ./configure					# run the `configure' script
   % make					# build gedit
   [ Become root if necessary ]
diff --git a/data/Makefile.am b/data/Makefile.am
index 65c9262..9dd9542 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,34 +3,16 @@ desktop_in_files = gnoemoe.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-# schemasdir = $(GCONF_SCHEMA_FILE_DIR)
-# schemas_in_files = gnoemoe.schemas.in
-# schemas_DATA  = $(schemas_in_files:.schemas.in=.schemas)
-# @INTLTOOL_SCHEMAS_RULE@
-
 mimedir 	= $(datadir)/mime/packages
 mime_DATA 	= gnoemoe.xml
 
 langdir = $(datadir)/gtksourceview-1.0/language-specs
 lang_DATA = moo.lang
 
-# if GCONF_SCHEMAS_INSTALL
-# install-data-local:
-# 	if test -z "$(DESTDIR)" ; then \
-# 		for p in $(schemas_DATA) ; do \
-# 			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \
-# 		done \
-# 	fi
-# else
-# install-data-local:
-# endif
-
 EXTRA_DIST = 				\
 	$(desktop_in_files)		\
-#	$(schemas_in_files		\
 	$(mime_DATA)			\
 	$(lang_DATA)
 
 CLEANFILES =	 			\
-	$(desktop_DATA)			
-#	$(schemas_DATA)			
+	$(desktop_DATA)					
diff --git a/gnoemoe/Makefile.am b/gnoemoe/Makefile.am
index a4ca489..2996c5b 100644
--- a/gnoemoe/Makefile.am
+++ b/gnoemoe/Makefile.am
@@ -60,4 +60,4 @@ CLEANFILES += $(BUILT_SOURCES)
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
 
-AM_CFLAGS = -Werror -Wall -Wsign-compare
+# AM_CFLAGS = -Werror -Wall -Wsign-compare
diff --git a/gnoemoe/gm-world.c b/gnoemoe/gm-world.c
index de8b364..5f4749b 100644
--- a/gnoemoe/gm-world.c
+++ b/gnoemoe/gm-world.c
@@ -747,8 +747,8 @@ gm_world_log(GmWorld *world, GmLogType type, gchar const *text) {
 	}
 
 	if (gm_options_get_int(options, "logging_add_timestamp")) {
-		start = g_strdup_printf("[%02d:%02d:%02d] ", timet->tm_hour, 
-				timet->tm_min, timet->tm_sec);
+		start = g_strdup_printf("[%02d:%02d] ", timet->tm_hour, 
+				timet->tm_min);
 		s = g_string_new(start);
 		g_free(start);
 	} else {
@@ -1149,7 +1149,8 @@ gm_world_sendln_log(GmWorld *world, gchar const *text, GmLogType logtype) {
 		normal = g_strdup(text);
 	}
 	
-	if (logtype != LOG_NONE) {
+	if (logtype != LOG_NONE && (logtype != LOG_OUT || 
+			gm_mcp_session_initialized(world->priv->mcp))) {
 		gm_world_log(world, logtype, text);
 	}
 	
diff --git a/gnoemoe/mcp/gm-mcp-session.c b/gnoemoe/mcp/gm-mcp-session.c
index 1da9004..f2bee47 100644
--- a/gnoemoe/mcp/gm-mcp-session.c
+++ b/gnoemoe/mcp/gm-mcp-session.c
@@ -259,9 +259,12 @@ gm_mcp_session_reset(GmMcpSession *session) {
 	}
 	
 	g_list_free(session->priv->multiline);
-	session->priv->multiline = NULL;
-	
-	
+	session->priv->multiline = NULL;	
+}
+
+gboolean
+gm_mcp_session_initialized(GmMcpSession *session) {
+	return (session->priv->authkey != NULL);
 }
 
 GList const *
diff --git a/gnoemoe/mcp/gm-mcp-session.h b/gnoemoe/mcp/gm-mcp-session.h
index 4cbb721..0b7f817 100644
--- a/gnoemoe/mcp/gm-mcp-session.h
+++ b/gnoemoe/mcp/gm-mcp-session.h
@@ -68,6 +68,7 @@ GmMcpSession *gm_mcp_session_new(GObject *world);
 GObject *gm_mcp_session_world(GmMcpSession *session);
 GList const *gm_mcp_session_get_packages(GmMcpSession *session);
 void gm_mcp_session_reset(GmMcpSession *session);
+gboolean gm_mcp_session_initialized(GmMcpSession *session);
 
 void gm_mcp_session_handle_oob(GmMcpSession *session, gchar *line);