diff --git a/README b/README
index 482854ae..764ecc56 100644
--- a/README
+++ b/README
@@ -1,38 +1,36 @@
 
-    Geary Email Client
-    ------------------
+Geary: Send and receive email
+=============================
 
-  * Introduction
+Geary is an email application built around conversations, for the
+GNOME 3 desktop. It allows you to read, find and send email with a
+straightforward, modern interface.
 
-    Geary is an IMAP email client built for the GNOME desktop environment.  It
-    allows you to read and send email with a simple, modern interface.
+Visit https://wiki.gnome.org/Apps/Geary for more information.
 
-    Visit https://wiki.gnome.org/Apps/Geary to read about the current state of
-    Geary's development and to make sure you're running the latest version.
+Installation & Licensing
+------------------------
 
+Please consult the INSTALL and COPYING files for more information.
 
-  * Installation & Licensing
+Getting in Touch
+----------------
 
-    Please consult the INSTALL and COPYING files for more information.
+ * Found a bug? Please report it!
+   https://wiki.gnome.org/Apps/Geary/ReportingABug
+ * Mailing list: http://mail.gnome.org/mailman/listinfo/geary-list
+ * IRC Channel:  #geary on irc.gimp.org
 
+Contributing to Geary
+---------------------
 
-  * Quick Start
+Want to help improve Geary? Here are some ways to contribute:
 
-    The first time Geary is launched, it will prompt for your account
-    information.  Note that your email password is stored securely in the
-    Gnome Keyring.
-
-    Geary will then begin downloading messages in your inbox and other
-    folders.
-
-  * Contacting Geary Developers
-
-    Geary wiki:                 https://wiki.gnome.org/Apps/Geary
-
-    We also encourage you to join the Geary mailing list.  See
-    https://mail.gnome.org/mailman/listinfo/geary-list for details.
-
-
-
-    Copyright 2016 Software Freedom Conservancy Inc.
+ * Bug reporting: https://wiki.gnome.org/Apps/Geary/ReportingABug
+ * Development:   https://wiki.gnome.org/Apps/Geary/Development
+ * Translating:   https://wiki.gnome.org/Apps/Geary/Translating
+ * Join the mailing list or IRC channel and join in the discussion
 
+---
+Copyright 2016 Software Freedom Conservancy Inc.
+Copyright 2017 Michael Gratton <mike@vee.net>
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..1fa26703
--- /dev/null
+++ b/README.md
@@ -0,0 +1,43 @@
+
+Geary: Send and receive email
+=============================
+
+Geary is an email application built around conversations, for the
+GNOME 3 desktop. It allows you to read, find and send email with a
+straightforward, modern interface.
+
+Visit https://wiki.gnome.org/Apps/Geary for more information.
+
+**GitHub users please note**: Bug reports, code contributions and
+translations are managed using GNOME's infrastructure, so we cannot
+accept tickets or pull requests on GitHub. Please see the links below
+for more information.
+
+![Geary displaying a conversation](https://wiki.gnome.org/Apps/Geary?action=AttachFile&amp;do=get&amp;target=geary-conversation-0.12.png)
+
+Installation & Licensing
+------------------------
+
+Please consult the [INSTALL](./INSTALL) and [COPYING](./COPYING) files
+for more information.
+
+Contributing to Geary
+---------------------
+
+Want to help improve Geary? Here are some ways to contribute:
+
+ * Bug reporting: https://wiki.gnome.org/Apps/Geary/ReportingABug
+ * Development:   https://wiki.gnome.org/Apps/Geary/Development
+ * Translating:   https://wiki.gnome.org/Apps/Geary/Translating
+ * Join the mailing list or IRC channel and join in the discussion
+
+Getting in Touch
+----------------
+
+ * Geary wiki:   https://wiki.gnome.org/Apps/Geary
+ * Mailing list: http://mail.gnome.org/mailman/listinfo/geary-list
+ * IRC Channel:  [irc://irc.gimp.org/%23geary](#geary on irc.gimp.org)
+
+---
+Copyright 2016 Software Freedom Conservancy Inc.  
+Copyright 2017 Michael Gratton <mike@vee.net>