diff --git a/readme.txt b/readme.txt
index bb52fc88..ba0c1f8f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,27 +1,30 @@
 === _s ===
 Contributors: automattic
-Tags: featured-images, translation-ready, custom-background, theme-options
+Tags: translation-ready, custom-background, theme-options, custom-menu, post-formats, threaded-comments
 Requires at least: 4.0
 Tested up to: 4.2
 Stable tag: 1.0.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
-Short description. No more than 150 chars.
+A starter theme called _s, or underscores.
 
 == Description ==
-Full theme description.
+
+Hi. I'm a starter theme called _s, or underscores, if you like. I'm a theme meant for hacking so don't use me as a Parent Theme. Instead try turning me into the next, most awesome, WordPress theme out there. That's what I'm here for.
 
 == Frequently Asked Questions ==
 
-= A question that someone might have =
+= Does this theme support any plugins? =
 
-An answer to that question.
+_s includes support for Infinite Scroll in Jetpack.
 
 == Changelog ==
 
 = 1.0 =
 * Initial release
 
-== Resources ==
- * example-script.js © 2015 Jane Doe, CC0
\ No newline at end of file
+== Credits ==
+
+* Based on Underscores http://underscores.me/, (C) 2012-2015 Automattic, Inc., MIT
+* normalize.css http://necolas.github.io/normalize.css/, (C) 2012-2015 Nicolas Gallagher and Jonathan Neal, MIT
\ No newline at end of file