diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b1ddae2..c92bd47f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v1.0.0-beta.18 - 2017-01-16
+
+### Features
+
+- Improve Etcher CLI error messages.
+- Replace the `--robot` CLI option with an `ETCHER_CLI_ROBOT` environment variable.
+- Sort supported extensions alphabetically in the image file-picker.
+- Label system drives in the drive-list widget.
+- Show available Etcher version in the update notifier.
+- Confirm before user quits while writing.
+- Add a changelog link to the update notifier modal.
+- Make the image file picker attach to the main window (as a real modal).
+
+### Fixes
+
+- Fix alignment of single call to action buttons inside modals.
+- Fix "Invalid message" error caused by the IPC client emitting multiple JSON objects as a single message.
+- Fix "This key is already associated with an element of this collection" error when multiple partitions point to the same drive letter on Windows.
+- Fix system drives detected as removable drives on Mac Mini.
+- Fix sporadic "EIO: i/o error, read" errors during validation.
+- Fix "EIO: i/o error, write" error.
+
 ## v1.0.0-beta.17 - 2016-11-28
 
 ### Fixes
@@ -18,7 +40,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Fix drive scanning exceptions on GNU/Linux systems with `net.ifnames` enabled.
 - Fix `0x80131700` error when scanning drives on Windows.
 - Fix internal SDCard drive descriptions.
-- Fix unmount issues in GNU/Linux and OS Xwhen paths contain spaces.
+- Fix unmount issues in GNU/Linux and OS X when paths contain spaces.
 - Fix "Not Enough Space" error when flashing unaligned images.
 - Fix `at least one volume could not be unmounted` error in OS X.
 
diff --git a/docs/MAINTAINERS.md b/docs/MAINTAINERS.md
index 0ca4aa03..6dec52b8 100644
--- a/docs/MAINTAINERS.md
+++ b/docs/MAINTAINERS.md
@@ -10,16 +10,14 @@ Preparing a new version
 - Bump the version number in the `package.json`'s `version` property.
 
 - Bump the version number in the `package.json`'s `builder.win.version`
-property.
+
+- Bump the version number in the `npm-shrinkwrap.json`'s `version` property.
 
 - Add a new entry to `CHANGELOG.md` by running `npm run changelog`.
 
 - Re-take `screenshot.png` so it displays the latest version in the bottom
 right corner.
 
-- Re-install all dependencies and run `npm shrinkwrap` to update
-`npm-shrinkwrap.json`.
-
 - Commit the changes with the version number as the commit title, including the
 `v` prefix, to `master`. For example:
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index bf81ea68..bf1e5a98 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "etcher",
-  "version": "1.0.0-beta.17",
+  "version": "1.0.0-beta.18",
   "dependencies": {
     "angular": {
       "version": "1.5.7",
diff --git a/package.json b/package.json
index 4d7f6dd3..01478373 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "etcher",
   "displayName": "Etcher",
-  "version": "1.0.0-beta.17",
+  "version": "1.0.0-beta.18",
   "main": "lib/start.js",
   "description": "Flash OS images to SD cards & USB drives, safely and easily.",
   "productDescription": "Etcher is a powerful OS image flasher built with web technologies to ensure flashing an SDCard or USB drive is a pleasant and safe experience. It protects you from accidentally writing to your hard-drives, ensures every byte of data was written correctly and much more.",
@@ -49,7 +49,7 @@
   "builder": {
     "win": {
       "title": "Etcher",
-      "version": "v1.0.0-beta.17",
+      "version": "v1.0.0-beta.18",
       "publisher": "Resin.io",
       "icon": "assets/icon.ico",
       "verbosity": 1
diff --git a/screenshot.png b/screenshot.png
index 0551a763..35ee1bcf 100644
Binary files a/screenshot.png and b/screenshot.png differ