diff --git a/ChangeLog b/ChangeLog
index 2bdc8361be..54c2b07709 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-21  Kevin Cozens  <kcozens@cvs.gnome.org>
+
+	* plug-ins/script-fu/scheme-wrapper.c: Reverted changes in handling
+	of string arrays to stay backwards compatible (see bug #317634).
+
+	* plug-ins/script-fu/scripts/font-map.scm: Updated based on change
+	in handling of string arrays listed above.
+
 2007-10-21  Michael Natterer  <mitch@gimp.org>
 
 	* app/dialogs/fade-dialog.c (fade_dialog_new): revert change below.
diff --git a/plug-ins/script-fu/scheme-wrapper.c b/plug-ins/script-fu/scheme-wrapper.c
index b7fac2d47c..c76548c0de 100644
--- a/plug-ins/script-fu/scheme-wrapper.c
+++ b/plug-ins/script-fu/scheme-wrapper.c
@@ -608,7 +608,13 @@ script_fu_marshal_procedure_call (scheme *sc, pointer a)
   gchar           *string;
   gint32           n_elements;
   pointer          vector;
+
 #if DEBUG_MARSHALL
+/* These three #defines are from Tinyscheme (tinyscheme/scheme.c) */
+#define T_MASKTYPE  31
+#define typeflag(p) ((p)->_flag)
+#define type(p)     (typeflag(p)&T_MASKTYPE)
+
 char *ret_types[] = {
   "GIMP_PDB_INT32",       "GIMP_PDB_INT16",     "GIMP_PDB_INT8",
   "GIMP_PDB_FLOAT",       "GIMP_PDB_STRING",    "GIMP_PDB_INT32ARRAY",
@@ -1006,20 +1012,20 @@ if (count > 0)
           break;
 
         case GIMP_PDB_STRINGARRAY:
-          vector = sc->vptr->pair_car (a);
-          if (!sc->vptr->is_vector (vector))
+          vector = sc->vptr->pair_car (a);  /* vector is pointing to a list */
+          if (!sc->vptr->is_list (sc, vector))
             success = FALSE;
           if (success)
             {
-              n_elements = args[i-1].data.d_int32;
+              n_elements = args[i - 1].data.d_int32;
               if (n_elements < 0 ||
-                  n_elements > sc->vptr->vector_length (vector))
+                  n_elements > sc->vptr->list_length (sc, vector))
                 {
                   g_snprintf (error_str, sizeof (error_str),
                               "STRING vector (argument %d) for function %s has "
-                              "length of %ld but expected length of %d",
+                              "length of %d but expected length of %d",
                               i+1, proc_name,
-                              sc->vptr->vector_length (vector), n_elements);
+                              sc->vptr->list_length (sc, vector), n_elements);
                   return foreign_error (sc, error_str, 0);
                 }
 
@@ -1027,7 +1033,7 @@ if (count > 0)
 
               for (j = 0; j < n_elements; j++)
                 {
-                  pointer v_element = sc->vptr->vector_elem (vector, j);
+                  pointer v_element = sc->vptr->pair_car (vector);
 
                   if (!sc->vptr->is_string (v_element))
                     {
@@ -1039,18 +1045,20 @@ if (count > 0)
 
                   args[i].data.d_stringarray[j] =
                       (gchar *) sc->vptr->string_value (v_element);
+
+                  vector = sc->vptr->pair_cdr (vector);
                 }
 
 #if DEBUG_MARSHALL
 {
-glong count = sc->vptr->vector_length (vector);
+glong count = sc->vptr->list_length ( sc, sc->vptr->pair_car (a) );
 g_printerr ("      string vector has %ld elements\n", count);
 if (count > 0)
   {
     g_printerr ("     ");
     for (j = 0; j < count; ++j)
       g_printerr (" \"%s\"",
-               sc->vptr->string_value ( sc->vptr->vector_elem (vector, j) ));
+                  args[i].data.d_stringarray[j]);
     g_printerr ("\n");
   }
 }
@@ -1408,16 +1416,19 @@ g_printerr ("      value %d is type %s (%d)\n",
               {
                 gint    num_strings = values[i].data.d_int32;
                 gchar **array  = (gchar **) values[i + 1].data.d_stringarray;
-                pointer vector = sc->vptr->mk_vector (sc, num_strings);
+                pointer list   = sc->NIL;
 
-                return_val = sc->vptr->cons (sc, vector, return_val);
+                return_val = sc->vptr->cons (sc, list, return_val);
                 set_safe_foreign (sc, return_val);
 
-                for (j = 0; j < num_strings; j++)
+                for (j = num_strings - 1; j >= 0; j--)
                   {
-                    sc->vptr->set_vector_elem (vector, j,
-                                               sc->vptr->mk_string (sc,
-                                                                    array[j]));
+                    list = sc->vptr->cons (sc,
+                                           sc->vptr->mk_string
+                                               (sc, array[j] ? array[j] : ""),
+                                           list);
+
+                    sc->vptr->set_car (return_val, list);
                   }
               }
               break;
diff --git a/plug-ins/script-fu/scripts/font-map.scm b/plug-ins/script-fu/scripts/font-map.scm
index f64d50eb1e..9df105b7a9 100644
--- a/plug-ins/script-fu/scripts/font-map.scm
+++ b/plug-ins/script-fu/scripts/font-map.scm
@@ -16,7 +16,7 @@
            (font     "")
            (extents  '()))
       (while (< count list-cnt)
-        (set! font (aref list count))
+        (set! font (car list))
 
         (if (= use-name TRUE)
             (set! text font))
@@ -27,6 +27,7 @@
         (if (> width maxwidth)
             (set! maxwidth width))
 
+        (set! list (cdr list))
         (set! count (+ count 1))
       )
 
@@ -41,7 +42,7 @@
            (font      "")
            (extents   '()))
       (while (< count list-cnt)
-        (set! font (aref list count))
+        (set! font (car list))
 
         (if (= use-name TRUE)
             (set! text font)
@@ -54,6 +55,7 @@
             (set! maxheight height)
         )
 
+        (set! list (cdr list))
         (set! count (+ count 1))
       )
 
@@ -104,7 +106,7 @@
           (gimp-edit-clear drawable)
 
     (while (< count num-fonts)
-      (set! font (aref font-list count))
+      (set! font (car font-list))
 
       (if (= use-name TRUE)
           (set! text font))
@@ -133,6 +135,7 @@
           )
       )
 
+      (set! font-list (cdr font-list))
       (set! count (+ count 1))
     )