diff --git a/ChangeLog b/ChangeLog
index 5fc8f7ba1..2e31dfe50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-28  Andrés G. Aragoneses  <aaragoneses@novell.com>
+
+	* atk/Util.custom: unregister get_root function when the setter
+	receives null. Partial fix for BNC#411444.
+
 2008-08-27  Mike Kestner  <mkestner@novell.com>
 
 	* generator/ManagedCallString.cs: use existing Parameters.IsHidden
diff --git a/atk/Util.custom b/atk/Util.custom
index d7445d355..79e87c242 100644
--- a/atk/Util.custom
+++ b/atk/Util.custom
@@ -185,9 +185,13 @@
 		public static GetRootDelegate GetRootHandler {
 			set {
 				get_root_handler = value;
-				if (get_root_callback == null)
-					get_root_callback = new GetRootNativeDelegate (GetRootCallback);
-				atksharp_util_override_get_root (get_root_callback);
+				if (value == null)
+					atksharp_util_override_get_root (null);
+				else {
+					if (get_root_callback == null)
+						get_root_callback = new GetRootNativeDelegate (GetRootCallback);
+					atksharp_util_override_get_root (get_root_callback);
+				}
 			}
 		}