diff --git a/ChangeLog b/ChangeLog
index a95812ae..674e24d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+13/03/2008
+
+Fixed MAP18 from Catoptromancy.
+
 12/03/2008
 
 New sound by CSonicGo; map various sound sfx to empty slots.
diff --git a/NEWS b/NEWS
index 18ceec7d..38cea2fd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+2008.03.05	v0.6.2
+
+Quality control? What quality control? :) Thanks to Catoptromancy for fixing
+a total show-stopper bug on MAP18.
+
 2008.03.05	v0.6.1
 
 0.6.1 released. Include all patches in all IWADS, to prevent crashes with
diff --git a/levels/catoptromancy/map18.wad b/levels/catoptromancy/map18.wad
new file mode 100644
index 00000000..e9b0d34b
Binary files /dev/null and b/levels/catoptromancy/map18.wad differ
diff --git a/levels/catoptromancy/map18_fix.txt b/levels/catoptromancy/map18_fix.txt
new file mode 100644
index 00000000..1dbbf1e1
--- /dev/null
+++ b/levels/catoptromancy/map18_fix.txt
@@ -0,0 +1,8 @@
+Freedoom svn 446 
+
+map18 - sector  211  had floor and ceiling hieght of 0, would block player 
+fixed - raised cieling hieght 
+
+tested in prboom+, map is nicely playable and beatable now. A bit easy, but fun. 
+
+- Catoptromancy
diff --git a/levels/map18.wad b/levels/map18.wad
index 9211579a..9ed353f8 120000
--- a/levels/map18.wad
+++ b/levels/map18.wad
@@ -1 +1 @@
-zigmund/map18.wad
\ No newline at end of file
+catoptromancy/map18.wad
\ No newline at end of file