diff --git a/ChangeLog b/ChangeLog
index 9c9c0012e1..8f91a66911 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-10-19  Sven Neumann  <sven@gimp.org>
+
+	* plug-ins/script-fu/scripts/script-fu.init: don't load
+	script-fu-compat.init here.
+
+	* plug-ins/script-fu/scheme-wrapper.c (tinyscheme_init): load it
+	here, from the same place where script-fu.init was found.
+
+	* plug-ins/script-fu/script-fu-interface.c: made the code more
+	robust against invalid adjustment types.
+
 2006-10-19  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/script-fu/script-fu-interface.[ch]
diff --git a/plug-ins/script-fu/scheme-wrapper.c b/plug-ins/script-fu/scheme-wrapper.c
index 1252d5cd36..87aa60727f 100644
--- a/plug-ins/script-fu/scheme-wrapper.c
+++ b/plug-ins/script-fu/scheme-wrapper.c
@@ -333,6 +333,21 @@ tinyscheme_init (const gchar *path,
             {
               scheme_load_file (&sc, fin);
               fclose (fin);
+
+              /*  To improve compatibility with older Script-Fu scripts,
+               *  load script-fu-compat.init from the same directory.
+               */
+              filename = g_build_filename (list->data,
+                                           "script-fu-compat.init", NULL);
+              fin = g_fopen (filename, "rb");
+              g_free (filename);
+
+              if (fin)
+                {
+                  scheme_load_file (&sc, fin);
+                  fclose (fin);
+                }
+
               break;
             }
         }
diff --git a/plug-ins/script-fu/script-fu-interface.c b/plug-ins/script-fu/script-fu-interface.c
index 325232b929..9328af83dd 100644
--- a/plug-ins/script-fu/script-fu-interface.c
+++ b/plug-ins/script-fu/script-fu-interface.c
@@ -408,6 +408,11 @@ script_fu_interface (SFScript *script,
               gtk_entry_set_activates_default (GIMP_SCALE_ENTRY_SPINBUTTON (script->arg_values[i].sfa_adjustment.adj), TRUE);
             break;
 
+          default:
+            g_warning ("unexpected adjustment type: %d",
+                       script->arg_defaults[i].sfa_adjustment.type);
+            /* fallthrough */
+
           case SF_SPINNER:
             left_align = TRUE;
             widget =
diff --git a/plug-ins/script-fu/scripts/script-fu.init b/plug-ins/script-fu/scripts/script-fu.init
index bbf78e70b9..4efb1ef2dc 100644
--- a/plug-ins/script-fu/scripts/script-fu.init
+++ b/plug-ins/script-fu/scripts/script-fu.init
@@ -582,7 +582,3 @@
 		(else (error "cond-expand : unknown operator" (car condition)))))))
 
 (gc-verbose #f)
-
-; The following improves compatibility with older Script-Fu scripts.
-(load (string-append gimp-data-directory DIR-SEPARATOR "scripts"
-                     DIR-SEPARATOR "script-fu-compat.init"))