diff --git a/UPGRADING b/UPGRADING
index dc5d432242..c85094051b 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -1,6 +1,16 @@
-How do I upgrade my existing LyX system to version 1.6.x?
+How do I upgrade my existing LyX system to version 2.0.x?
 ---------------------------------------------------------
 
+* Upgrading from LyX 1.6.x:
+
+The format of preference and session files has changed. LyX 2.0.x is
+able to read old files but will save them in the new format.
+
+The format of layout files has changed but, as before,
+layout2layout.py will convert older versions to the new format
+automatically.
+
+
 * Upgrading from LyX 1.5.x:
 
 The format of preference and session files has changed. LyX 1.6.x is
@@ -82,44 +92,39 @@ have to update them
 Build requirements
 ------------------
 
-LyX 1.6 uses the Qt 4.x toolkit (version 4.2.0 or newer). Contrary to
-previous versions of LyX, it won't build against Qt 2.x or 3.x.
-Furthermore, the XForms frontend was dropped.
+LyX 2.0 uses the Qt 4.x toolkit (version 4.4.0 or newer).
 
-LyX's graphics handling system has changed substantially. If you
-do not have the JPEG library installed, you may need to install
-it before you can use the graphics capabilities of LyX. If you
-do not have the ImageMagick command-line tools installed, you
-will need to modify the default set up of LyX, or install them,
-in order to get previews of your document's graphics.
+If you do not have the JPEG library installed, you may need to install it
+before you can use the graphics capabilities of LyX. If you do not have the
+ImageMagick command-line tools installed, you will need to modify the default
+set up of LyX, or install them, in order to get previews of your document's
+graphics.
 
 Document transfer
 -----------------
 
 * Compatibility with older documents/layouts
 
-LyX 1.6.x uses an external python script, lyx2lyx, to import documents
+LyX 2.0.x uses an external python script, lyx2lyx, to import documents
 written using previous versions of LyX. All versions of LyX as far back as
-0.10 are supported, so any klyx users still holding out for an alternative
-to xforms will finally be able to put their dinosaur to rest ;-)
+0.10 are supported.
 
-Of course, this means that you must have python (at least version 2.3.4)
-installed in order to use LyX 1.6.x with your old documents.
+Of course, this means that you must have python (>= 2.3.4, <3)
+installed in order to use LyX 2.0.x with your old documents.
 
-lyx2lyx also has the framework in place to be able to convert
-documents to an earlier format (which requires python 2.3.4 at
-least). However, these converters have only been written for the
-conversion from 1.6.x to 1.5.x, 1.4.x and 1.3.x, so versions of LyX
-older than 1.3.0 will NOT be able to read documents saved with LyX
-1.6.x. The conversion from 1.6.x to 1.5.x-1.3.x is lossless as long as
-no new features are used. lyx2lyx tries hard to find something
-equivalent for new features such as boxes, but this is known to fail
-sometimes. LyX 1.5.7 contains an updated lyx2lyx that can read
-documents in 1.6.x format.
+lyx2lyx also has the framework in place to be able to convert documents to an
+earlier format (which requires python 2.3.4 at least). However, these
+converters have only been written for the conversion from 2.0.x to 1.6.x,
+1.5.x, 1.4.x and 1.3.x, so versions of LyX older than 1.3.0 will NOT be able to
+read documents saved with LyX 2.0.x. The conversion from 2.0.x to 1.6.x-1.3.x
+is lossless as long as no new features are used. lyx2lyx tries hard to find
+something equivalent for new features such as boxes, but this is known to fail
+sometimes. LyX 1.6.9 contains an updated lyx2lyx that can read documents in
+2.0.x format.
 
 Furthermore, LyX uses a converter layout2layout.py, also written in python
 that will convert old layout files on the fly. You can also call it manually
-on your layout files if you want to convert them to 1.6.x format permanently.
+on your layout files if you want to convert them to 2.0.x format permanently.
 
 * Preparing for Unicode: