diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ed97f52c..dd77bdd26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
-## [Sabaki v0.17.3][v0.17.3] (2016-09-18)
+## [Sabaki v0.18.0][v0.18.0] (2016-09-18)
 
 **Added**
 
-* Add support for non-UTF8 encodings
+* Add support for non-UTF8 encodings (Thanks to @apetresc)
 * Add basic text editing keyboard shortcuts when editing/writing comments on macOS
 
 **Changed**
@@ -422,8 +422,8 @@ All notable changes to this project will be documented in this file.
 
 First release
 
-[unreleased]: https://github.com/yishn/Sabaki/compare/v0.17.3...master
-[v0.17.3]: https://github.com/yishn/Sabaki/compare/v0.17.2...v0.17.3
+[unreleased]: https://github.com/yishn/Sabaki/compare/v0.18.0...master
+[v0.18.0]: https://github.com/yishn/Sabaki/compare/v0.17.2...v0.18.0
 [v0.17.2]: https://github.com/yishn/Sabaki/compare/v0.17.1...v0.17.2
 [v0.17.1]: https://github.com/yishn/Sabaki/compare/v0.17.0...v0.17.1
 [v0.17.0]: https://github.com/yishn/Sabaki/compare/v0.16.1...v0.17.0
diff --git a/package.json b/package.json
index c886b7817..9b34691fe 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sabaki",
   "productName": "Sabaki",
-  "version": "0.17.3",
+  "version": "0.18.0",
   "description": "An elegant Go/Baduk/Weiqi board and SGF editor for a more civilized age.",
   "author": "Yichuan Shen",
   "main": "main.js",
@@ -26,8 +26,8 @@
   },
   "scripts": {
     "test": "mocha",
-    "build:win": "electron-packager ./ sabaki --platform=win32 --arch=all --app-version=0.17.3 --build-version=0.17.3 --version=1.3.6 --out=./bin --overwrite --icon=./data/icon.ico --app-copyright=\"Copyright (C) 2015/2016 Yichuan Shen\" --version-string.CompanyName=\"Yichuan Shen\" --version-string.FileDescription=\"Sabaki\" --version-string.OriginalFilename=\"sabaki.exe\" --version-string.ProductName=\"Sabaki\" --version-string.InternalName=\"sabaki.exe\" --ignore=^test$ --asar",
-    "build:linux": "electron-packager ./ sabaki --platform=linux --arch=all --app-version=0.17.3 --build-version=0.17.3 --version=1.3.6 --out=./bin --overwrite --app-copyright=\"Copyright (C) 2015/2016 Yichuan Shen\" --ignore=^test$ --asar",
-    "build:osx": "electron-packager ./ Sabaki --platform=darwin --arch=all --app-version=0.17.3 --build-version=0.17.3 --version=1.3.6 --out=./bin --overwrite --app-copyright=\"Copyright (C) 2015/2016 Yichuan Shen\" --icon=./data/icon.icns --app-category-type=public.app-category.games --extend-info=./data/extra-info.plist --ignore=^test$ --asar"
+    "build:win": "electron-packager ./ sabaki --platform=win32 --arch=all --app-version=0.18.0 --build-version=0.18.0 --version=1.3.6 --out=./bin --overwrite --icon=./data/icon.ico --app-copyright=\"Copyright (C) 2015/2016 Yichuan Shen\" --version-string.CompanyName=\"Yichuan Shen\" --version-string.FileDescription=\"Sabaki\" --version-string.OriginalFilename=\"sabaki.exe\" --version-string.ProductName=\"Sabaki\" --version-string.InternalName=\"sabaki.exe\" --ignore=^test$ --asar",
+    "build:linux": "electron-packager ./ sabaki --platform=linux --arch=all --app-version=0.18.0 --build-version=0.18.0 --version=1.3.6 --out=./bin --overwrite --app-copyright=\"Copyright (C) 2015/2016 Yichuan Shen\" --ignore=^test$ --asar",
+    "build:osx": "electron-packager ./ Sabaki --platform=darwin --arch=all --app-version=0.18.0 --build-version=0.18.0 --version=1.3.6 --out=./bin --overwrite --app-copyright=\"Copyright (C) 2015/2016 Yichuan Shen\" --icon=./data/icon.icns --app-category-type=public.app-category.games --extend-info=./data/extra-info.plist --ignore=^test$ --asar"
   }
 }