diff --git a/ChangeLog b/ChangeLog
index 58cbfcf..8e444a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
+Fri Jul  1 12:47:05 1994  Guido van Rossum  (guido@voorn.cwi.nl)
+
+	* Makefile.in (Makefile): add dependency on config.status
+
+	* configure.in: support --with-gcc[=value], --without-gcc
+
+	* configure.in, acconfig.h, config.h.in: check for clock_t
+
+	* Modules/{arraymodule,mpzmodule}.c: Include sys/types.h, for size_t
+
+	* Lib/test/test_types.py (6.5.1 Strings): test for nasty string
+	formatting bug
+
+	* Objects/stringobject.c (formatstring): fix nasty bug in resizing
+
 Wed Jun 29 10:01:17 1994  Guido van Rossum  (guido@voorn.cwi.nl)
 
+	* Doc/ref3.tex (section{The standard type hierarchy}
+	\label{types}): fix typo
+
 	* Lib/packmail.py: applied patch from Lance to remove '.' and '..'
 
 Tue Jun 28 00:57:35 1994  Guido van Rossum  (guido@voorn.cwi.nl)
diff --git a/acconfig.h b/acconfig.h
index 6b9d32f..494dea2 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -9,6 +9,9 @@
    (as it does on SCI ODT 3.0) */
 #undef BAD_STATIC_FORWARD
 
+/* Define to `long' if <time.h> doesn't define.  */
+#undef clock_t
+
 /* Define if getpgrp() must be called as getpgrp(0)
    and (consequently) setpgrp() as setpgrp(0, 0). */
 #undef GETPGRP_HAVE_ARG
diff --git a/config.h.in b/config.h.in
index aab770a..ff6490e 100644
--- a/config.h.in
+++ b/config.h.in
@@ -87,6 +87,9 @@
    (as it does on SCI ODT 3.0) */
 #undef BAD_STATIC_FORWARD
 
+/* Define to `long' if <time.h> doesn't define.  */
+#undef clock_t
+
 /* Define if getpgrp() must be called as getpgrp(0)
    and (consequently) setpgrp() as setpgrp(0, 0). */
 #undef GETPGRP_HAVE_ARG