diff --git a/ChangeLog b/ChangeLog
index ea7da7b0..2ddf03cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+05/03/2008
+
+Include all patches in all IWADS, to prevent crashes with WADs that use custom
+TEXTURE1 lumps. Also, take this opportunity to fix some long-standing bug
+issues in MAP10 and MAP18. Improve MAP02 (remove secret exit switch); add an
+exit switch to the unfinished MAP12; add a new MAP14. Tweaked MAP05 to prevent
+an area you can get stuck in, courtesy of Catoptromancy.
+
 27/02/2008
 
 add sounds/nthompson - replacement rocket launch and explosion.
diff --git a/NEWS b/NEWS
index d673f342..18ceec7d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+2008.03.05	v0.6.1
+
+0.6.1 released. Include all patches in all IWADS, to prevent crashes with
+WADs that use custom TEXTURE1 lumps. Several map fixes too (see ChangeLog)
+
 2008.02.28      v0.6
 
 0.6 released.
diff --git a/levels/catoptromancy/map05.wad b/levels/catoptromancy/map05.wad
new file mode 100644
index 00000000..f6de26ee
Binary files /dev/null and b/levels/catoptromancy/map05.wad differ
diff --git a/levels/catoptromancy/map05_fix.txt b/levels/catoptromancy/map05_fix.txt
new file mode 100644
index 00000000..822a449d
--- /dev/null
+++ b/levels/catoptromancy/map05_fix.txt
@@ -0,0 +1,13 @@
+Fredoom map05 svn 445
+
+added 2 vertexes to line 1177, 
+moved new vertexes slightly,  
+realigned 2 textures
+
+player could get trapped behind the the pillar (sector 196). 
+
+-Catoptromancy
+
+built nodes using bsp
+
+-Jon
diff --git a/levels/map05.wad b/levels/map05.wad
index e37112b5..4a4500df 120000
--- a/levels/map05.wad
+++ b/levels/map05.wad
@@ -1 +1 @@
-amarande/map05.wad
\ No newline at end of file
+catoptromancy/map05.wad
\ No newline at end of file