diff --git a/ChangeLog b/ChangeLog
index 54c2b07709..65858f8ee2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-21  Simon Budig  <simon@gimp.org>
+
+        * plg-ins/script-fu/scheme-wrapper.c: Add comment regarding
+	  the safe-foreign issue.
+
 2007-10-21  Kevin Cozens  <kcozens@cvs.gnome.org>
 
 	* plug-ins/script-fu/scheme-wrapper.c: Reverted changes in handling
diff --git a/plug-ins/script-fu/scheme-wrapper.c b/plug-ins/script-fu/scheme-wrapper.c
index c76548c0de..54b875ffb6 100644
--- a/plug-ins/script-fu/scheme-wrapper.c
+++ b/plug-ins/script-fu/scheme-wrapper.c
@@ -1428,6 +1428,10 @@ g_printerr ("      value %d is type %s (%d)\n",
                                                (sc, array[j] ? array[j] : ""),
                                            list);
 
+                    /* hook the current list into return_val, so that it
+                     * inherits the set_safe_foreign()-protection.
+                     * May be removed when tinyscheme fixes the GC issue
+                     * with foreign functions */
                     sc->vptr->set_car (return_val, list);
                   }
               }