diff --git a/NEWS b/NEWS
index 5c4a214fc..f29a14ef2 100644
--- a/NEWS
+++ b/NEWS
@@ -52,6 +52,12 @@ The new configure option `--enable-deprecated=LEVEL' and the
 environment variable GUILE_WARN_DEPRECATED control this mechanism.
 See INSTALL and README for more information.
 
+** Guile is much more likely to work on 64-bit architectures.
+
+Guile now compiles and passes "make check" with only two UNRESOLVED GC
+cases on Alpha based machines now.  Thanks to John Goerzen for the use
+of a test machine.
+
 ** New functions: setitimer and getitimer.
 
 These implement a fairly direct interface to the libc functions of the
diff --git a/THANKS b/THANKS
index 6e9ad2a04..1eb38dc64 100644
--- a/THANKS
+++ b/THANKS
@@ -7,9 +7,9 @@ The Guile maintainer committee consists of
 
 Contributors since the last release:
 
-
 For fixes or providing information which led to a fix:
 
 	 Martin Baulig
             Rob Browning
-     Christopher Cramer
+    Christopher Cramer
+           John Goerzen 
diff --git a/TODO b/TODO
index 00a58ce32..6ca4ff836 100644
--- a/TODO
+++ b/TODO
@@ -66,6 +66,13 @@ that user-visible changes are reflected in NEWS.
   - rewrite core macros (define-class et al) in C
   - define C API
 
+- Compile with --enable-error-on-warning without failure.  Requires a
+  number of fixes, including num2integral.i.c and on some platforms
+  gc_os_dep.c.  Also SCM_FIXABLE etc. will produce unavoidable
+  warnings on some platforms with some vars as written now.  i.e. on
+  alphas, SCM_FIXABLE(some_int) is always true.  We need more
+  conditional compilation or similar.
+
 - Move sample .gdbinit in HACKING to somewhere more appropriate (manual?).
 
 - Make sure we have appropriate interface numbers for shared
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 0d4ec3953..75e2c56d9 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,23 @@
+2001-09-21  Rob Browning  <rlb@defaultvalue.org>
+
+	* .cvsignore: really add version.h
+
+	* strings.h (SCM_SET_STRING_LENGTH): coerce "l" to a long.
+	Otherwise it fails on the alpha.  However, we might rather choose
+	this size conditionally.
+
+	* numbers.c (scm_gcd): change "k" to a long from an int.
+	Otherwise it fails on the alpha.  However, we might rather choose
+	this size conditionally.
+
+	* error.c (scm_wta): coerce char* to intptr_t before int
+	assignment.
+
+	* debug.c (debugobj_print): coerce scm_intprint arg 1 to long, not
+	int.
+
+	* chars.h (SCM_MAKE_CHAR): coerce value to intptr_t.
+
 2001-09-20  Mikael Djurfeldt  <mdj@linnaeus>
 
 	* numbers.c (scm_integer_expt): Accept inexact integer in second
diff --git a/srfi/ChangeLog b/srfi/ChangeLog
index f5691433e..7b0e54d8a 100644
--- a/srfi/ChangeLog
+++ b/srfi/ChangeLog
@@ -1,3 +1,28 @@
+2001-09-21  Rob Browning  <rlb@defaultvalue.org>
+
+	* srfi-14.h (SCM_CHARSET_GET): need 1L, not just 1 in "<<".
+
+	* srfi-14.c (SCM_CHARSET_SET): need 1L, not just 1 in "<<".
+	(scm_char_set_hash): val needs to be long, not just unsigned.
+	(scm_char_set): need 1L, not just 1 in "<<".
+	(scm_list_to_char_set): need 1L, not just 1 in "<<".
+	(scm_list_to_char_set_x): need 1L, not just 1 in "<<".
+	(scm_list_to_char_set_x): FUNC_NAME was wrong - added a _x.
+	(scm_string_to_char_set): string length var needed to be
+	scm_sizet, not int.
+	(scm_string_to_char_set): need 1L, not just 1 in "<<".
+	(scm_string_to_char_set_x): string length var needed to be
+	scm_sizet, not int.
+	(scm_string_to_char_set_x): need 1L, not just 1 in "<<".
+	(scm_char_set_filter): need 1L, not just 1 in "<<".
+	(scm_char_set_filter_x): need 1L, not just 1 in "<<".
+	(scm_ucs_range_to_char_set): need 1L, not just 1 in "<<".
+	(scm_ucs_range_to_char_set_x): need 1L, not just 1 in "<<".
+	(scm_char_set_adjoin): need 1L, not just 1 in "<<".
+	(scm_char_set_delete): need 1L, not just 1 in "<<".
+	(scm_char_set_adjoin_x): need 1L, not just 1 in "<<".
+	(scm_char_set_delete_x): need 1L, not just 1 in "<<".
+
 2001-09-12  Gary Houston  <ghouston@arglist.com>
 
 	* srfi-1.scm (filter): change "caller" to "filter" in check-arg-type.
diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index 75bcb0db1..c70fc90ed 100644
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-21  Rob Browning  <rlb@defaultvalue.org>
+
+	* tests/numbers.test (fixnum-bit): compute dynamically.
+
+	* tests/bit-operations.test (fixnum-bit): compute dynamically.
+
 2001-09-07  Thien-Thi Nguyen  <ttn@revel.glug.org>
 
 	* tests/getopt-long.test ("apples-blimps-catalexis example",