diff --git a/UPGRADING b/UPGRADING
index 468c3e9a1..8c6300f8f 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -1,5 +1,16 @@
                        Music Player Daemon (MPD) - UPGRADING
 
+Upgrading to 0.11.0
+-------------------
+
+The database format has changed a little bit, but in a backward compatible way.
+This means that if you upgrade to 0.11.0 from 0.10.x, you do not need to make
+any changes.  However, if you downgrade back to 0.10.x, then you will need
+to recreate your db.
+
+The default port for MPD is now 6600, so update your mpd and client
+configurations appropriatly.
+
 Upgrading to 0.10.0
 -------------------
 
diff --git a/doc/mpd.1 b/doc/mpd.1
index 69afef89f..d621e7002 100644
--- a/doc/mpd.1
+++ b/doc/mpd.1
@@ -24,7 +24,7 @@ can be specified on the command line: PORT, MUSIC_DIR, PLAYLIST_DIR, LOG_FILE,
 Read more about MPD on http://www.musicpd.org
 .SH OPTIONS
 .TP
-.B --create-db
+.BI --create-db
 (Re)Crete the db file for mpd.
 .TP
 .BI --help