diff --git a/BUGS b/BUGS
index f186d0da0e1..082f70092de 100644
--- a/BUGS
+++ b/BUGS
@@ -6,12 +6,33 @@ nother to make an entry in this file, unless it was a serious bug
 ==> Status indicators: (-) not fixed; (*) fixed; (?) don't know what to do.
 
 ======================================================================
+BUGS found in 1.1 and fixed in 1.1.1
+------------------------------------
+
+(*) pow() should be declared varargs since it uses newgetargs
+
+BUGS found in 1.1 and not yet fixed
+-----------------------------------
+
+(-) A built-in function using getargs() and expecting >= 1 argument
+may dump core when called without arguments
+
+BUGS found in 1.0.3 and fixed in 1.1
+------------------------------------
+
+
+(*) If class C doesn't define __cmp__, cmp(a,b) will return -2 and
+[a,b].sort() will fail
+
 BUGS found in 1.0.3 and not yet fixed
 -------------------------------------
 
 (-) print_error raises and then masks an error if softspace is not
     defined (can't reproduce this one?)
 
+BUGS found in 1.0.3 and fixed in 1.1
+------------------------------------
+
 (*) Syntax errors are reported in a silly way if multi-line tokens are
 involved.
 
@@ -24,9 +45,6 @@ involved.
 (*) various memory leaks (see purify report from anthony.baxter@aaii.oz.au)
 (several leaks fixed anyway :-)
 
-BUGS found in 1.0.3 and fixed in 1.1
-------------------------------------
-
 (*) unwanted entries in stack trace if err_clear() clears an error
 that also set a stack trace
 
diff --git a/ChangeLog b/ChangeLog
index 9cd88d3390b..307ead973ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+Thu Oct 20 08:31:02 1994  Guido van Rossum  <guido@tesla>
+
+	* Modules/makesetup: should use $cc not cc
+
+	* configure.in, configure, config.h.in: test for presence of
+        stddef.h
+
+	* Include/structmember.h: include <stddef.h> if it exists
+
+Wed Oct 19 11:45:35 1994  Guido Van Rossum  <guido@tesla>
+
+	* Makefile.in: patch by Wolf-D. Ihlenfeld to use BINDIR etc
+
+	* Lib/tkinter/Tkinter.py: added option_{add,clear,get,readfile} to
+	Misc class
+
+	* Lib/poly.py: fix bug in minus()
+
+	* Modules/Setup.in: clarified optional SGI modules and improved
+	template for using *noconfig*
+
+	* Doc/Makefile: don't assum '.' is in $PATH
+
+	* Modules/mathmodule.c, Doc/libmath.tex: add hypot()
+
+	* Makefile.in: on libinstall, automatically run sharedinstall in
+	Modules
+
+	* Modules/Makefile.pre.in: always make sharedmods
+
+	* Modules/makesetup: quote $ in two places
+
+	* configure.in, acconfig.h.in, config.h.in, configure,
+	Modules/posixmodule.c: separate arg requirements for getpgrp() and
+	setpgrp()
+
+	* Nt/Python/makefile.nt.mak: added getargs()
+
+Thu Oct 13 07:51:03 1994  Guido van Rossum  <guido@voorn.cwi.nl>
+
+	* README: removed misleading comment about example Setup.* files
+
 =================================
 ==> Release 1.1 (11 Oct 1994) <==
 =================================
diff --git a/README b/README
index b47763a429f..95c46e7694d 100644
--- a/README
+++ b/README
@@ -68,8 +68,7 @@ yourself.  Never edit Setup.in -- always edit Setup.  Read the
 comments in the file for information on what kind of edits you can
 make.  When you have edited Setup, Makefile and config.c in Modules
 will automatically be rebuilt the next time you run make in the
-toplevel directory.  (There are some example Setup files which you may
-copy to Setup for specific systems; have a look at Setup.*.)
+toplevel directory.
 
 If you want to change the optimization level of the build, assign to
 the OPT variable on the toplevel make command; e.g. "make OPT=-g" will
diff --git a/TODO b/TODO
index 9871547abe2..b3409713003 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,32 @@
+(*) newgetargs() dumps core in compat mode when NULL is passed in but
+max is >0
+
+(-) stack frame correspondence problem (Jim Roskind)
+
+(-) invent new style (rename1.h) name for newgetargs
+
+(-) make lots of places use newgetargs
+
+(-) no tp_str member in typeobject
+
+(-) getargs has small bugs (e.g. strange error msgs)
+
+(-) sorting class instances broken if no __com__ defined
+
+(-) readline 2.0 on sequent has ^C problem (works only first time)
+
+(-) add explanatory comments to Setup (especially about SGI modules
+like 'cd')
+
+(-) Q3 ftp mail archive
+
+(-) need to add truncate() and ftruncate() to posixmodule.c (Windows:
+chsize(fd, size)
+
+======================================================================
+Release 1.1 (11 Oct 1994)
+======================================================================
+
 (*) 2 specific leaks: 1 PYTHONPATH; 2 reading code from .pyc
 
 (-) if __getattr__ prints something, calling repr(x) from cmd line