diff --git a/ghc/docs/users_guide/4-06-notes.sgml b/ghc/docs/users_guide/4-06-notes.sgml
new file mode 100644
index 0000000000000000000000000000000000000000..851c2013ab6f632d4ec0365baa40ac4a9e339893
--- /dev/null
+++ b/ghc/docs/users_guide/4-06-notes.sgml
@@ -0,0 +1,250 @@
+<Sect1 id="release-4-06">
+<Title>Release notes for version&nbsp;4.06&mdash;1/00
+</Title>
+
+<Para>
+
+<ItemizedList>
+<ListItem>
+
+<Para>
+User visible changes
+
+<ItemizedList>
+
+<ListItem>
+<Para>
+Major library reorganisation.  The libraries are now split into 8
+categories:
+
+<VariableList>
+
+<VarListEntry>
+<Term><Literal>concurrent</Literal></Term>
+<ListItem>
+<Para>
+Same as the old <literal>concurrent</literal> library
+</Para>
+</ListItem>
+</VarListEntry>
+
+<VarListEntry>
+<Term><Literal>data</Literal></Term>
+<ListItem>
+<Para>
+Datatypes.  Contains old <literal>FiniteMap</literal>
+and <literal>Set</literal> modules, and Chris Okasaki's Edison
+library.
+</Para>
+</ListItem>
+</VarListEntry>
+
+<VarListEntry>
+<Term><Literal>lang</Literal></Term>
+<ListItem>
+<Para>
+contains most of the contents of
+the old <literal>exts</literal> library
+</Para>
+</ListItem>
+</VarListEntry>
+
+<VarListEntry>
+<Term><Literal>net</Literal></Term>
+<ListItem>
+<Para>
+networking-related libraries (Socket, SocketPrim, and
+new URI library).
+</Para>
+</ListItem>
+</VarListEntry>
+
+<VarListEntry>
+<Term><Literal>num</Literal></Term>
+<ListItem>
+<Para>
+numerical-related libraries (currently empty).
+</Para>
+</ListItem>
+</VarListEntry>
+
+<VarListEntry>
+<Term><Literal>posix</Literal></Term>
+<ListItem>
+<Para>
+the old POSIX library
+</Para>
+</ListItem>
+</VarListEntry>
+
+<VarListEntry>
+<Term><Literal>text</Literal></Term>
+<ListItem>
+<Para>
+text-processing related libraries (including Andy Gill's
+HTML library)
+</Para>
+</ListItem>
+</VarListEntry>
+
+<VarListEntry>
+<Term><Literal>util</Literal></Term>
+<ListItem>
+<Para>
+various miscellaneous libraries, including John Hughes'
+and Koen Claessen's QuickCheck library.
+</Para>
+</ListItem>
+</VarListEntry>
+
+</VariableList>
+
+See the accompanying libraries documentation for more details.
+</Para>
+</ListItem>
+
+<ListItem>
+<Para>
+Cleanup of concurrent I/O system.  We now use non-blocking I/O on
+all Handles, so that multiple threads can do I/O simultaneously.
+We <Emphasis>don't</Emphasis> however do non-blocking I/O on <Constant>stdout</Constant>/<Constant>stderr</Constant>,
+due to reports that some shells don't correctly restore
+blocking mode on these file descriptors after running a program.
+</Para>
+</ListItem>
+
+<ListItem>
+<Para>
+Exception changes
+
+<ItemizedList>
+<ListItem>
+<Para>
+<Function>raiseInThread</Function> can now raise exceptions in threads blocked on I/O or time delays.
+</Para>
+</ListItem>
+
+<ListItem>
+<Para>
+New functions in <literal>Exception</literal>
+
+<ProgramListing>
+blockAsyncExceptions   :: IO a -> IO a
+unblockAsyncExceptions :: IO a -> IO a
+</ProgramListing>
+
+used to control the delivery of asynchronous exceptions to
+a thread (including those raised via <Function>raiseInThread</Function>).
+</Para>
+</ListItem>
+
+<ListItem>
+<Para>
+Asynchronous exceptions are now blocked by default inside
+an exception handler.  Use <Function>unblockAsyncExceptions</Function> to
+restore the previous behaviour.
+</Para>
+</ListItem>
+
+</ItemizedList>
+
+</Para>
+</ListItem>
+
+<ListItem>
+<Para>
+Add NetBSD/x86 support.
+</Para>
+</ListItem>
+
+<ListItem>
+<Para>
+Added support for <Literal>foreign export dynamic</Literal>.
+</Para>
+</ListItem>
+
+</ItemizedList>
+
+</Para>
+</ListItem>
+
+<ListItem>
+<Para>
+Minor changes
+
+<ItemizedList>
+
+<ListItem>
+<Para>
+Build system cleanup&mdash;<Command>BIN_DIST=1</Command> is now needed in <Filename>build.mk</Filename> (before building!) to build binary dists.
+</Para>
+</ListItem>
+
+<ListItem>
+<Para>
+New RTS option <Option>-xc</Option>, which prints the current cost-centre
+stack to stderr whenever an exception is raised (only for
+profiling builds).
+</Para>  
+</ListItem>
+
+</ItemizedList>
+
+</Para>
+</ListItem>
+
+<ListItem>
+<Para>
+Not-quite-ready-yet, but in there nontheless
+
+<VariableList>
+
+<VarListEntry>
+<Term>
+SMP support
+</Term>
+<ListItem>
+<Para>
+Building way '<Literal>s</Literal>' on a system with pthreads (only tested on
+Linux so far) will include support for running multiple
+Haskell threads on several pthreads simultaneously.  If
+your system supports it, this will enable Haskell programs
+to take advantage of multiprocessor SMP machines.
+</Para>
+</ListItem>
+</VarListEntry>
+
+<VarListEntry>
+<Term>
+GranSim and GUM
+</Term>
+<ListItem>
+<Para>
+Initial ports of GranSim and GUM to GHC 4 are in there.  Not quite
+ready yet.
+</Para>
+</ListItem>
+</VarListEntry>
+
+<VarListEntry>
+<Term>
+Profiling
+</Term>
+<ListItem>
+<Para>
+Heap profiling sort-of works.  Only cost-centre heap
+profiles are supported so far.
+</Para>
+</ListItem>
+</VarListEntry>
+
+</VariableList>
+
+</Para>
+</ListItem>
+
+</ItemizedList>
+
+</Para>
+
+</Sect1>
diff --git a/ghc/docs/users_guide/installing.sgml b/ghc/docs/users_guide/installing.sgml
index b9d37c1413db0684db14b946d82e109ae7c59459..7a72e787066a215cfb586d749b08fdc003392c48 100644
--- a/ghc/docs/users_guide/installing.sgml
+++ b/ghc/docs/users_guide/installing.sgml
@@ -585,8 +585,9 @@ the new settings take effect.
 
 <Sect2 id="sec-required"><Title>Software required</Title>
 
-You need two chunks of software other than GHC itself: the Cygwin toolchain, and
-Perl.  Here's how to get and install them.
+<Para>
+You need two chunks of software other than GHC itself: the Cygwin toolchain, and Perl.  Here's how to get and install them.
+</Para>
 
 <Sect3><Title>The cygwin toolchain (beta20.1)</Title>
 
@@ -727,6 +728,7 @@ when you invoke GHC, such as:
   Reason: file does not exist /tmp/ghc11068.cpp
 </Screen>
 We think this is due to a bug in Cygwin.
+</Para>
 </ListItem>
 
 <ListItem>
diff --git a/ghc/docs/users_guide/users_guide.sgml b/ghc/docs/users_guide/users_guide.sgml
index 6867ea941c28754ddbac92388f24a6d8fc76a233..b385bd00b449e350996be0be9e5acc8af5b72b10 100644
--- a/ghc/docs/users_guide/users_guide.sgml
+++ b/ghc/docs/users_guide/users_guide.sgml
@@ -1,7 +1,7 @@
 <!DOCTYPE BOOK PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
         <!ENTITY license        SYSTEM "license.sgml">
         <!ENTITY intro          SYSTEM "intro.sgml" >
-        <!ENTITY relnotes       SYSTEM "4-04-notes.sgml" >
+        <!ENTITY relnotes       SYSTEM "4-06-notes.sgml" >
         <!ENTITY installing     SYSTEM "installing.sgml" >
         <!ENTITY using          SYSTEM "using.sgml" >
         <!ENTITY runtime        SYSTEM "runtime_control.sgml" >
@@ -20,7 +20,7 @@
 <Book>
 
 <BookInfo>
-<Title>The Glasgow Haskell Compiler User's Guide, Version&nbsp;4.04</Title>
+<Title>The Glasgow Haskell Compiler User's Guide, Version&nbsp;4.06</Title>
 <Author><OtherName>The GHC Team</OtherName></Author>
 <Address>
 <Email>glasgow-haskell-&lcub;bugs,users&rcub;-request@haskell.org</Email>