diff --git a/trunk/ripnews/CHANGELOG b/trunk/ripnews/CHANGELOG
index 5b1422a..1ddd3d1 100644
--- a/trunk/ripnews/CHANGELOG
+++ b/trunk/ripnews/CHANGELOG
@@ -1,6 +1,12 @@
 # $Id$
 # $Source$
 
+from 0.0.5 to 0.0.6
+	- new option -C for combined filenames eg. "subject-[filename]"
+	- prevent reconnect loops
+	- be more paranoid with decoding yEnc-encoded articles
+	- more/better timeouts
+
 from 0.0.4 to 0.0.5
 	- implement timeouts on article fetching
 	  (no more "hangs", hopefully)
diff --git a/trunk/ripnews/README b/trunk/ripnews/README
index eba3fae..0d07b75 100644
--- a/trunk/ripnews/README
+++ b/trunk/ripnews/README
@@ -91,6 +91,7 @@ Supported commandline options:
 "-c", "--configfile"	Specify a different config file. Default
 			.ripnewsrc
 "-L", "--longname"	Sets long filenames.
+"-C", "--combinedname"	Sets combined filenames.
 "-X", "--exclude"	Set exclude pattern.
 "-T", "--test"		Set test mode. Newsrc files will not be writen
 			to.
@@ -100,6 +101,7 @@ Supported config options:
 
 OPT_I=<pattern>			Set include pattern.
 OPT_L=<bool>			Set long filenames.
+OPT_C=<bool>			Sets combined filenames.
 OPT_X=<pattern>			Set include pattern
 OPT_T=<bool>			Set test mode. Newsrc files will not be written
 				to.
@@ -127,9 +129,7 @@ Known bugs:
 ===========
 
 There are a lot of known bugs at this time. Basically the error handling
-is still almost non existant and server reconnects are not yet possible.
-This can be annoying (ok, it _is_ annoying) when server1 timesout while
-you're still processing server2. Well, if it breaks you get to keep
+is still almost non existant. Well, if it breaks you get to keep
 _both_ pieces. That's what you get with pre-alpha software ;)
 
 Credits: