diff --git a/CHANGES.current b/CHANGES.current
index d1c7471a1..eff8fde45 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -1,6 +1,22 @@
 Version 1.3.20 (In progress)
 ============================
 
+11/02/2003: mkoeppe (Matthias Koeppe)
+	    [Guile] Merge new set of GOOPS changes by John Lenz.
+	    GOOPS objects are now manipulated directly by the C code.
+	    Some fixes to typemap-GOOPS interaction.
+
+11/02/2003: mkoeppe (Matthias Koeppe)
+	    [Guile] Remove the file argument to -scmstub and -goops.
+	    The Scheme files are now always called MODULE.scm or
+	    MODULE-primitive.scm, where MODULE is the module name and 
+	    "primitive" can be changed by the -primsuffix option.
+	    The Scheme files are now placed in the directory given by
+	    the -outdir option, or the current directory.
+	    (Patch by John Lenz, slightly modified.)
+
+	    *** INCOMPATIBILITY [Guile] ***
+
 11/02/2003: mkoeppe (Matthias Koeppe)
 	    Unify the pointer-conversion runtime API.  The standard
 	    functions are:
diff --git a/TODO b/TODO
index 59e2d7115..a694ba1a5 100644
--- a/TODO
+++ b/TODO
@@ -393,12 +393,14 @@ PHP
 Guile
 -----
 
-**     Rename slot setters from CLASS-SLOT-set to CLASS-SLOT-set!
+**     Maybe rename slot setters from CLASS-SLOT-set to CLASS-SLOT-set!
        to match Scheme convention for naming of mutators.
 
 **     Support keyword args.
 
-**     Support GOOPS shadow classes.
+[DONE] Support GOOPS shadow classes.
+
+**     Director Support!
 
 [DONE] Support garbage collection.
 
@@ -407,7 +409,8 @@ Guile
        GOOPS metaclasses?)
 
 **     Maybe communicate the type system between object modules via Scheme
-       variables, rather than a shared object.
+       variables, rather than a shared object.  This would remove the
+       need of a shared SWIG runtime library.
 
 **     Provide a clean way to construct type predicates.