diff --git a/offlineimap/head/debian/changelog b/offlineimap/head/debian/changelog
index 49caa77..50824ca 100644
--- a/offlineimap/head/debian/changelog
+++ b/offlineimap/head/debian/changelog
@@ -1,5 +1,6 @@
 offlineimap (3.99.6) unstable; urgency=low
 
+  * This a 4.0 TRACK release, and may be unstable or in flux!
   * Completed work to make both graphical interfaces work 
     with a threaded Tcl/Tk Tkinter.  A threaded Tcl/Tk actually makes
     life MORE difficult for multi-threaded Python programs, argh.
@@ -21,6 +22,9 @@ offlineimap (3.99.6) unstable; urgency=low
     However, this is not going to be a huge problem because the new Curses
     Blinkenlights interface has this support, and does it a lot better than
     TTY.TTYUI ever could have.
+  * Provided config file default for many more options.  Closes: #168219.
+  * New example file offlineimap.conf.minimal showing you how to get started
+    fast.  It uses only 6 lines to set up an account.
 
  -- John Goerzen <jgoerzen@complete.org>  Thu,  2 Jan 2003 13:59:44 -0600
 
diff --git a/offlineimap/head/offlineimap.conf b/offlineimap/head/offlineimap.conf
index 7980ef0..d925772 100644
--- a/offlineimap/head/offlineimap.conf
+++ b/offlineimap/head/offlineimap.conf
@@ -16,6 +16,9 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+# Looking for a quick start?  Take a look at offlineimap.conf.minimal.
+
+
 ##################################################
 # General definitions
 ##################################################
diff --git a/offlineimap/head/offlineimap.conf.minimal b/offlineimap/head/offlineimap.conf.minimal
new file mode 100644
index 0000000..50b3d27
--- /dev/null
+++ b/offlineimap/head/offlineimap.conf.minimal
@@ -0,0 +1,10 @@
+# Sample minimal config file.  Copy this to ~/.offlineimaprc and edit to
+# suit to get started fast.
+
+[general]
+accounts = Test
+
+[Test]
+localfolders = ~/Test
+remotehost = examplehost
+remoteuser = jgoerzen