diff --git a/ChangeLog b/ChangeLog
index 595066a9ae0a5a1703f1a4ed14a64c1af25f1900..d8265f9266bccbae8710ec40c0989c52e4d2c174 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -100,6 +100,8 @@ CVS code
 	- Change default flags to --enable-all.
 - THANKS:
 	- Add Kalle Kivimaa and Kalle Olavi Niemitalo, for Finnish (Jordi).
+- UPGRADE:
+	- Add upgrading information document for 1.0 users (Jordi).
 
 GNU nano 1.1.99pre2 - 2003.02.03
 - General:
diff --git a/Makefile.am b/Makefile.am
index 21431d22e996fb845fc638ba43d045bded778324..1415d249d50f906d40e4fa87b2a1e57d1ee500b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ info_TEXINFOS = nano.texi
 MAKEINFO = makeinfo --no-split
 
 EXTRA_DIST =	ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS \
-		README THANKS TODO config.rpath install-sh missing \
+		README THANKS TODO UPGRADE config.rpath install-sh missing \
 		mkinstalldirs nano.1.html nanorc.5.html faq.html \
 		nanorc.sample nano.spec $(man_MANS)
 
diff --git a/UPGRADE b/UPGRADE
new file mode 100644
index 0000000000000000000000000000000000000000..e65f825296fb5bc68554c059fd28a677b18e9b7f
--- /dev/null
+++ b/UPGRADE
@@ -0,0 +1,28 @@
+GNU nano upgrading information
+==============================
+
+Visible changes since 1.0
+-------------------------
+* Editor Features
+  - Complete Pico compatibility (--pico has been removed, and -p means
+    something else, see below).
+  - nanorc support.
+  - Smooth scrolling (-S).
+  - Searching of matching brace/bracket/etc.
+  - Help for all editor features.
+  - Color syntax highlighting support.
+  - Quote string support, useful for mail agents, etc (-Q).
+  - Insertion of output of external commands.
+  - Optional enabling of XON and XOFF control characters (-p).
+  - Tons of bugfixes/enhancements for already existing features.
+
+* File Handling
+  - Overwriting and appending or prepending to files.
+  - Writing marked text to separate files.
+  - Multiple file buffers (-F).
+  - Converting from and to DOS/Mac file format (-D/-M, -N to disable).
+  - Better control character handling.
+  - Creation of backup files (-B).
+  - Search/replace history (-H).
+
+See the GNU nano manual for detailed information on each feature.