diff --git a/AUTHORS.txt b/AUTHORS.txt
index 8da1e622c..aa13a2665 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,6 +1,6 @@
-OpenSceneGraph Library 1.9.7
+OpenSceneGraph Library 1.9.8
 
-263 Contributors:
+264 Contributors:
 
 Firstname Surname
 -----------------
@@ -27,25 +27,25 @@ Norman Vine
 Alberto Farre
 Ruben Lopez
 Randall Hopper
+Roger James
 Gideon May
 Don Tidrow
 Romano José Magacho da Silva
-Roger James
+Olaf Flebbe
 Michael Gronager
 Colin McDonald
 Chris Hanson
-Olaf Flebbe
 Daniel Sjölie
 Mathias Fröhlich
 Joran Jessurun
 Anré Garneau
+Per Fahlberg
 Frederic Marmond
 David Fries
 Boris Bralo
 Yefei He
 Sondra Iverson
 Rune Schmidt Jensen
-Per Fahlberg
 Neil Salter
 Jason Beverage
 David Spilling
@@ -58,6 +58,7 @@ Martin Naylor
 Martin Aumueller
 Markus Trenkwalder
 Joakim Simonsson
+Jeremy Moles
 Gordon Tomlinson
 Andreas Ekstrand
 Vivek Rajan
@@ -67,7 +68,6 @@ Ravi Mathur
 Michael Platings
 Loic Dachary
 Joseph Steel
-Jeremy Moles
 Jason Daly
 David Guthrie
 Corbin Holtz
@@ -80,6 +80,7 @@ Romano Magacho
 Paul de Repentigny
 Nikolaus Hanekamp
 Michael Hartman
+Martin Lavery
 Leandro Motta Barros
 Laurens Voerman
 Carlo Camporesi
@@ -126,7 +127,6 @@ Michael Henheffer
 Maya Leonard
 Max Behensky
 Mathew May
-Martin Lavery
 Martijn Kragtwijk
 Kevin Moiule
 Keith Steffen
@@ -204,6 +204,7 @@ Mathia Walker
 Mason Menninger
 Martin Spott
 Martin Amueller
+Marin Lavery
 Maria Ten
 Louis Hamilton
 Lewis Harmon
diff --git a/ChangeLog b/ChangeLog
index 0cbdc22ba..17c24a8ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,116 @@
+2007-06-06 11:34 +0000 [r6860]  robert:
+
+	* From Roger James, "These fix a couple of problems in the ac3d
+	  writer. 1. Number of child node of the world object set
+	  incorrectly in when scene contains shape drawables. 2. Incorrect
+	  handling of line primitives."
+
+2007-06-06 11:28 +0000 [r6859]  robert:
+
+	* From Olaf Flebbe, "an implementation of GraphicsWindow::setCursor
+	  for WIN32."
+
+2007-06-06 11:21 +0000 [r6858]  robert:
+
+	* Moved HelpHandler and StatsHandler classes into
+	  ViewerEventHandlers header, removed HelpHandler and StatsHandler
+	  headers
+
+2007-06-06 11:10 +0000 [r6857]  robert:
+
+	* Updated wrappers
+
+2007-06-06 10:58 +0000 [r6855-6856]  robert:
+
+	* Moved SimpleViewer from osgViewer into the osgviewerCocoa example
+	  directory as this is the only place in the OSG that now relies
+	  upon SimpleViewer.
+
+	* Added support for passing in ArgumentParser in Viewer and
+	  CompositeViewer constructor
+
+2007-06-06 08:59 +0000 [r6854]  robert:
+
+	* From Marin Lavery and Robert Osfield, XCode build fixes
+
+2007-06-05 20:42 +0000 [r6853]  robert:
+
+	* From Martin Lavery, XCode build fixes
+
+2007-06-05 19:44 +0000 [r6850-6852]  robert:
+
+	* Renamed osgmultiplecameras to osgcompositeviewer
+
+	* Renamed osgmultiplecamrea to osgcompositeviewer
+
+	* Added CompositeViewer support into FLTK example
+
+2007-06-05 19:36 +0000 [r6849]  shuber:
+
+	* from Stephan Huber: fixed build path for OpenThreads, so osg
+	  builds cleanly
+
+2007-06-05 19:10 +0000 [r6848]  robert:
+
+	* Added support for CompositeViewer
+
+2007-06-05 17:19 +0000 [r6846-6847]  robert:
+
+	* Improved the wording of CMake instructions
+
+	* From Martin Lavery, build fixes fo latest file additions
+
+2007-06-05 14:37 +0000 [r6845]  robert:
+
+	* Change interator to const_iterator to try and avoid Solaris build
+	  failure
+
+2007-06-05 11:18 +0000 [r6844]  robert:
+
+	* From Per Fahlberg, "added use of the internal format specified in
+	  the OpenFlight format attr files."
+
+2007-06-05 08:46 +0000 [r6843]  robert:
+
+	* Removed const to try and avoid Sun compiler error
+
+2007-06-05 08:30 +0000 [r6842]  robert:
+
+	* Removed redundent comma
+
+2007-06-04 21:32 +0000 [r6838-6839]  robert:
+
+	* Updated READEME
+
+	* Updated ChangeLog and AUTHORS.txt for 1.9.7 release
+
+2007-06-04 21:02 +0000 [r6837]  robert:
+
+	* Introduce OSG_BUILD_APPLICATION_BUNDLES option for OSX,
+	  defaulting to OFF.
+
+2007-06-04 20:32 +0000 [r6836]  robert:
+
+	* From Jeremy Moles and Rbert Osfeild, added extra details about
+	  CMake build options.
+
+2007-06-04 19:33 +0000 [r6835]  robert:
+
+	* Removed setting of font resolutions and added control of
+	  threading, with the default theading set to SingleThreading to
+	  avoid crashes associated with non thread safe sections of osgFX -
+	  the need to be fixed!!!
+
+2007-06-04 17:11 +0000 [r6834]  robert:
+
+	* Added control of threading model, setting default to
+	  SingleThreaded to avoid crash associated with mixing
+	  useCursor(false) and multi-threading.
+
+2007-06-04 16:20 +0000 [r6833]  robert:
+
+	* Updated version for 1.9.7 release
+
 2007-06-04 15:11 +0000 [r6832]  robert:
 
 	* Fixed stray control character
diff --git a/README.txt b/README.txt
index 2feb99341..804c7061d 100644
--- a/README.txt
+++ b/README.txt
@@ -10,11 +10,11 @@ For the impatient, read the simplified build notes below.
 
 Robert Osfield.
 Project Lead.
-4th June 2007.
+6th June 2007.
 
 --
 
-Notes for 1.9.7 release
+Notes for 1.9.8 release
 =======================
 
 OpenThreads/include and src directories has now been merged directly into