diff --git a/ChangeLog b/ChangeLog
index a1d8375c3..cdfbdd4e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-16  Ray Strode  <rstrode@redhat.com>
+
+	Add patch from Elijah Newren to fix type
+	for compositing_manager schema entry (bug 335901)
+
+	* src/metacity.schemas.in: Change type from "boolean" to "bool"
+	and default value from "FALSE" to "false"
+
 Wed Mar 22 13:16:48 2006  Søren Sandmann  <sandmann@redhat.com>
 
 	* src/compositor.c (meta_compositor_remove_window): Actually
diff --git a/src/metacity.schemas.in b/src/metacity.schemas.in
index fdc835e08..ac5bfac1c 100644
--- a/src/metacity.schemas.in
+++ b/src/metacity.schemas.in
@@ -272,13 +272,13 @@
       <key>/schemas/apps/metacity/general/compositing_manager</key>
       <applyto>/apps/metacity/general/compositing_manager</applyto>
       <owner>metacity</owner>
-      <type>boolean</type>
-      <default>FALSE</default>
+      <type>bool</type>
+      <default>false</default>
       <locale name="C">
-         <short>Compositing Manager</short>
-         <long>
-	Determines whether Metacity is a compositing manager.
-         </long>
+        <short>Compositing Manager</short>
+        <long>
+          Determines whether Metacity is a compositing manager.
+        </long>
       </locale>
     </schema>