diff --git a/CHANGES b/CHANGES
index 628e55a2a..2955075dc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes for SVN top of tree:
 
+Remove 'type 15' (weapon) from boulders. Reverts r11291 as the server now can
+handle 'type 0' (misc) objects.
+Andreas Kirschbaum 2009-06-17
+
 Reduce the range of the charm spell from +1/3 levels to +1/20 levels
 spell/MoodChange/spell_charm_monsters.arc
 James Lopeman 2009-06-15
diff --git a/misc/t_boulder.arc b/misc/t_boulder.arc
index 172e8c087..e1ae475ff 100644
--- a/misc/t_boulder.arc
+++ b/misc/t_boulder.arc
@@ -1,7 +1,6 @@
 Object t_boulder
 race rock
 name boulder
-type 15
 face boulder.111
 nrof 1
 weight 300000