diff --git a/ChangeLog b/ChangeLog
index d09be002d..452b9ed9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-08-24  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/generic.js: (log): added a hack to enable
+	child windows to log messages in the log console of the main window.
+
 	* SoObjects/Contacts/SOGoContactGCSList.m (-davAddressData): added
 	method.
 
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 40711ae5b..9ac02fd01 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -786,7 +786,14 @@ function log(message) {
         while (logWindow.opener)
             logWindow = logWindow.opener;
     }
-    var logConsole = logWindow.document.getElementById("logConsole");
+    if (logWindow && logWindow._logMessage) {
+        var logMessage = message;
+        setTimeout(function() { logWindow._logMessage(logMessage) }, 10);
+    }
+}
+
+function _logMessage(message) {
+    var logConsole = $("logConsole");
     if (logConsole) {
         if (message == "\c") {
             while (logConsole.firstChild) {