diff --git a/AUTHORS b/AUTHORS
index ad63e0fd..877af5d7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -302,3 +302,7 @@ Hubert Maier:
 Jordi Vilalta:
 [Numerous fixes and cleanups]
 [Support for building with C++]
+
+Max Horn:
+engine/
+	kmovement.c
diff --git a/ChangeLog b/ChangeLog
index d3959ce9..e43890c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-04-30  Christoph Reichenbach  <reichenb@colorado.edu>
 
+	* NEWS: Updated for 0.6.4
+
+	* src/engine/kmenu.c (_about_freesci_pages): Listed Max Horn as
+	contributor
+
 	* src/engine/gc.c (find_all_used_references): Fixed memory leak on
 	interfaces table
 
diff --git a/NEWS b/NEWS
index d8bcb328..65c624af 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+FreeSCI 0.6.4 is largely a bugfix release, addressing many constraints
+that prevented SCI0 games from being beatable.  We also added audio
+support for MIDI devices on newer versions of AmigaOS, and for General
+MIDI on all systems.  Finally, we replaced some code of unknown origin
+in our SetJump routine by a definitive clean-room re-implementation.
+
+
+
+
+-- 0.6.3 --
+
 The unstable release series continues, perhaps not quickly, but
 relentlessly.  While we have not yet achieved the stability of the
 stable release series, this release makes many SCI0 games largely
diff --git a/configure.ac b/configure.ac
index 78732d25..cea8d270 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_CONFIG_SRCDIR([acinclude.m4])
 
 AC_CANONICAL_TARGET([])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(freesci, 0.6.4-devel)
+AM_INIT_AUTOMAKE(freesci, 0.6.4-rc1)
 
 AC_PROG_CC
 #AC_LIBTOOL_DLOPEN
diff --git a/src/engine/kmenu.c b/src/engine/kmenu.c
index 81485a6d..4530d5c3 100644
--- a/src/engine/kmenu.c
+++ b/src/engine/kmenu.c
@@ -164,9 +164,11 @@ static struct {
 	 "\n\n"
 	 "Matt Hargett\nClean-ups, bugfixes, Hardcore QA, Win32"
 	 "\n\n"
-	 "Paul David Doherty\nGame version information"
+	 "Max Horn\nSetJump implementation"
 	 ,0, 15},
 	{"Still more of them",
+	 "Paul David Doherty\nGame version information"
+	 "\n\n"
 	 "Petr Vyhnak\nThe DCL-INFLATE algorithm, many Win32 improvements"
 	 "\n\n"
 	 "Rainer Canavan\nIRIX MIDI driver and bug fixes"
@@ -178,10 +180,10 @@ static struct {
 	 "Ruediger Hanke\nPort to the MorphOS platform"
 	 "\n\n"
 	 "Rune Orsval\nConfiguration file editor"
-	 "\n\n"
-	 "Rickard Lind\nMT32->GM MIDI mapping magic, sound research"
 	 ,0, 15},
 	{"Is there no end to these contributors?",
+	 "Rickard Lind\nMT32->GM MIDI mapping magic, sound research"
+	 "\n\n"
 	 "Rink Springer\nPort to the DOS platform, several bug fixes"
 	 "\n\n"
 	 "Robey Pointer\nBug tracking system hosting"