diff --git a/CHANGES.md b/CHANGES.md
index 0d02be33..6840a379 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,13 @@
+## 0.5.18 maintenance release
+
+* if the new nrepl is available start the server with it
+* only load nREPL dep if an :nrepl-port has been specified
+* remove single segment ns in namespace forms forms
+* allow `:npm-deps` to be `true` as well as `false`
+* added better error checking for missing ring handler
+* Clojure version comparison logic fix
+* change client side logging of a compile exception to a console.warning to support React Native better
+
 ## 0.5.17 new nREPL compatibility 
 
 Releasing this to support nREPL changes
diff --git a/README.md b/README.md
index 92343283..e60c0d27 100644
--- a/README.md
+++ b/README.md
@@ -206,7 +206,7 @@ Then include `lein-figwheel` in the `:plugins`
 section of your project.clj.
 
 ```clojure
-[lein-figwheel "0.5.17"]
+[lein-figwheel "0.5.18"]
 ```
 
 #### Configure your builds
@@ -591,7 +591,7 @@ Figwheel has a Clojure
 that makes it easy to start, stop and control Figwheel from Clojure.
 
 In order for the following examples to work, you will need to have
-`[figwheel-sidecar "0.5.17"]` and
+`[figwheel-sidecar "0.5.18"]` and
 `[com.bhauman/rebel-readline "0.1.4"]` in your dependencies.
 
 To start Figwheel from a script, you will need to require the
diff --git a/example/project.clj b/example/project.clj
index 1fcfaa94..2ce50105 100644
--- a/example/project.clj
+++ b/example/project.clj
@@ -22,7 +22,7 @@
 
   :plugins [[lein-ring "0.8.13" :exclusions [org.clojure/clojure]]
             #_[lein-cljsbuild "1.1.2"]
-            [lein-figwheel "0.5.18-SNAPSHOT"]
+            [lein-figwheel "0.5.18"]
             #_[lein-npm "0.4.0"]]
 
   :node-dependencies [[source-map-support "0.2.8"]
@@ -116,7 +116,7 @@
 
   :profiles { :dev { :dependencies [;[cider/piggieback "0.2.1"]
 
-                                    [figwheel-sidecar "0.5.18-SNAPSHOT"]
+                                    [figwheel-sidecar "0.5.18"]
                                     [org.clojure/tools.namespace "0.2.11"]
                                     #_[org.clojure/tools.nrepl "0.2.12"]
                                     #_[leiningen-core "2.6.1"]
diff --git a/plugin/project.clj b/plugin/project.clj
index cac5d736..1b8eadcc 100644
--- a/plugin/project.clj
+++ b/plugin/project.clj
@@ -1,4 +1,4 @@
-(defproject lein-figwheel "0.5.18-SNAPSHOT"
+(defproject lein-figwheel "0.5.18"
   :description "ClojureScript Autobuilder/Server which pushes changed files to the browser. This is the lein plugin."
   :url "https://github.com/bhauman/lein-figwheel"
   :license {:name "Eclipse Public License - v 1.0"
diff --git a/plugin/src/leiningen/figwheel.clj b/plugin/src/leiningen/figwheel.clj
index f508a3c8..d32173fb 100644
--- a/plugin/src/leiningen/figwheel.clj
+++ b/plugin/src/leiningen/figwheel.clj
@@ -12,7 +12,7 @@
    [leiningen.figwheel.fuzzy :as fuz]
    [simple-lein-profile-merge.core :as lm]))
 
-(def _figwheel-version_ "0.5.18-SNAPSHOT")
+(def _figwheel-version_ "0.5.18")
 (def _rebel-readline-cljs-version_ "0.1.4")
 
 (defn make-subproject [project paths-to-add]
diff --git a/sidecar/project.clj b/sidecar/project.clj
index f0e3294c..dffaf85a 100644
--- a/sidecar/project.clj
+++ b/sidecar/project.clj
@@ -1,4 +1,4 @@
-(defproject figwheel-sidecar "0.5.18-SNAPSHOT"
+(defproject figwheel-sidecar "0.5.18"
   :description "ClojureScript Autobuilder/Server which pushes changed files to the browser."
   :url "https://github.com/bhauman/lein-figwheel"
   :license {:name "Eclipse Public License - v 1.0"
@@ -24,7 +24,7 @@
      org.clojure/clojure]]
    [co.deps/ring-etag-middleware "0.2.0"]
    [clj-stacktrace "0.2.8"]
-   [figwheel "0.5.18-SNAPSHOT"
+   [figwheel "0.5.18"
       :exclusions [org.clojure/tools.reader]]
    [hawk "0.2.11" :exclusions [org.clojure/clojure]]
 
diff --git a/sidecar/src/figwheel_sidecar/config.clj b/sidecar/src/figwheel_sidecar/config.clj
index 023c88d9..3278e71b 100644
--- a/sidecar/src/figwheel_sidecar/config.clj
+++ b/sidecar/src/figwheel_sidecar/config.clj
@@ -19,7 +19,7 @@
 
 #_(remove-ns 'figwheel-sidecar.config)
 
-(def _figwheel-version_ "0.5.18-SNAPSHOT")
+(def _figwheel-version_ "0.5.18")
 
 ;; needed to determine the default color setting because windows
 ;; obtained these detection patterns from Jline3
diff --git a/support/project.clj b/support/project.clj
index 5afe079a..bee70733 100644
--- a/support/project.clj
+++ b/support/project.clj
@@ -1,4 +1,4 @@
-(defproject figwheel "0.5.18-SNAPSHOT"
+(defproject figwheel "0.5.18"
   :description "This project contains the client side code for Figwheel."
   :url "https://github.com/bhauman/lein-figwheel"
   :license {:name "Eclipse Public License - v 1.0"
diff --git a/support/src/figwheel/client.cljs b/support/src/figwheel/client.cljs
index cfb3d8cd..8001a990 100644
--- a/support/src/figwheel/client.cljs
+++ b/support/src/figwheel/client.cljs
@@ -15,7 +15,7 @@
   (:require-macros
    [cljs.core.async.macros :refer [go go-loop]]))
 
-(def _figwheel-version_ "0.5.18-SNAPSHOT")
+(def _figwheel-version_ "0.5.18")
 
 (def js-stringify
   (if (and (exists? js/JSON) (some? js/JSON.stringify))