diff --git a/AUTHORS.txt b/AUTHORS.txt
index f1325e5b0..8d24ec535 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,3 +1,5 @@
+Authors ordered by first contribution
+
 Jörn Zaefferer <joern.zaefferer@gmail.com>
 Ariel Flesler <aflesler@gmail.com>
 Scott González <scott.gonzalez@gmail.com>
@@ -79,7 +81,7 @@ Leonardo Balter <leonardo.balter@gmail.com>
 Jeff Cooper <jeff@kickstorming.com>
 Corey Frang <gnarf37@gmail.com>
 Nathan Dauber <nathan@radialogica.com>
-Michał Gołębiowski <m.goleb@gmail.com>
+Michał Gołębiowski <m.goleb@gmail.com>
 XhmikosR <xhmikosr@yahoo.com>
 Patrick Stapleton <github@gdi2290.com>
 DarkPark <darkpark@pisem.net>
@@ -93,3 +95,10 @@ Mislav Marohnić <mislav.marohnic@gmail.com>
 Anne-Gaelle Colom <coloma@westminster.ac.uk>
 Leonardo Braga <leonardo.braga@gmail.com>
 Jon Bretman <jon.bretman@lyst.com>
+Jonny Buchanan <jonathan.buchanan@gmail.com>
+Adrian Phinney <adrian.phinney@gmail.com>
+Lam Chau <lamchau@gmail.com>
+Henning Beyer <bubens@unpunk.de>
+Jesús Leganés Combarro <piranna@gmail.com>
+Shivam Dixit <shivamd001@gmail.com>
+Gaurav Mittal <gaurav.mittal@students.iiit.ac.in>
diff --git a/History.md b/History.md
index 9bde853de..3d9377cbb 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,23 @@
+1.18.0 / 2015-04-03
+==================
+
+  * Assert: throws uses push method only
+  * Assert: Fix missing test on exported throws
+  * Assert: Implements notOk to assert falsy values
+  * Core: More graceful handling of AMD
+  * Core: Simplify stack trace methods
+  * Core: Expose Dump maxDepth property
+  * Core: Expose QUnit version as QUnit.version property
+  * Core: Handle multiple testId parameters
+  * Dump: Fix .name/.property doublettes
+  * HTML Reporter: New diff using Google's Diff-Patch-Match Library
+  * HTML Reporter: Make it more obvious why diff is suppressed.
+  * HTML Reporter: Change display text for bad tests
+  * HTML Reporter: Fix checkbox and select handling in IE <9
+  * HTML Reporter: Fix test filter without any module
+  * HTML Reporter: Retain failed tests numbers
+  * Test: lowercase the valid test filter before using it
+
 1.17.1 / 2015-01-20
 ==================
 
diff --git a/package.json b/package.json
index 6c439f27a..4170cbe15 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "qunitjs",
   "title": "QUnit",
   "description": "An easy-to-use JavaScript Unit Testing framework.",
-  "version": "1.17.2-pre",
+  "version": "1.18.0-pre",
   "homepage": "http://qunitjs.com",
   "author": {
     "name": "jQuery Foundation and other contributors",
@@ -40,7 +40,7 @@
     "grunt-contrib-jshint": "0.10.0",
     "grunt-contrib-watch": "0.5.3",
     "grunt-coveralls": "0.3.0",
-    "grunt-git-authors": "1.2.0",
+    "grunt-git-authors": "3.0.0",
     "grunt-jscs": "0.8.1",
     "grunt-qunit-istanbul": "0.5.0",
     "grunt-search": "0.1.6",