diff --git a/ChangeLog b/ChangeLog
index 274d9935..5f0b1a9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2002-01-05  Tim Jansen  <tim@tjansen.de>
 
+	* lib/rfbServer.cc (update): removed blocks, added more sophistacated
+	  Hint handling in preparation for ZLib and Tight encodings
+
+	* lib/encodeRectangleHextile.cc:  replaced cut&paste code with macros,
+	  fixed one bug (in 8 bit encoding) while doing this
+
+	* lib/rfbServer.cc (update): fixed security bug that potentially
+	  allows the client to read any the whole KRfb server memory
+
 	* krfb/rfbcontroller.cc: fixed crash after client disconnect while
 	  krfb was writing
 
diff --git a/configure.in.in b/configure.in.in
index 069d9587..da3f16b1 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,6 +1,6 @@
 #MIN_CONFIG
 
-AM_INIT_AUTOMAKE(krfb,0.5.1)
+AM_INIT_AUTOMAKE(krfb,0.6)
 
 AC_CHECK_HEADER(X11/extensions/XTest.h, 
 	[],
diff --git a/krfb.lsm b/krfb.lsm
index d948fb0d..d0b48771 100644
--- a/krfb.lsm
+++ b/krfb.lsm
@@ -1,6 +1,6 @@
 Begin3
 Title:          KDE Desktop Sharing (KRfb)
-Version:        0.5.1
+Version:        0.6
 Entered-date:   
 Description:    KRfb is a RFB (VNC) server that allows sharing a local
 		X11 session. 
diff --git a/krfb/rfbconnection.cc b/krfb/rfbconnection.cc
index 600679ff..a3be1e1b 100644
--- a/krfb/rfbconnection.cc
+++ b/krfb/rfbconnection.cc
@@ -55,14 +55,10 @@ RFBConnection::RFBConnection(Display *_dpy,
 
 	createFramebuffer();
 
-	InitBlocks(32, 32);
-
 	sendFirstHandshake(connection);
 }
 
 RFBConnection::~RFBConnection() {
- 	DeleteBlocks();
-
 	destroyFramebuffer();
  	delete bufferedConnection;
 
diff --git a/krfb/rfbcontroller.cc b/krfb/rfbcontroller.cc
index 36dc0bb5..54fce46a 100644
--- a/krfb/rfbcontroller.cc
+++ b/krfb/rfbcontroller.cc
@@ -2,7 +2,7 @@
                               rfbcontroller.cpp
                              -------------------
     begin                : Sun Dec 9 2001
-    copyright            : (C) 2001 by Tim Jansen
+    copyright            : (C) 2001-2002 by Tim Jansen
     email                : tim@tjansen.de
  ***************************************************************************/