diff --git a/Changes b/Changes
index 704bea16..337ea3a0 100644
--- a/Changes
+++ b/Changes
@@ -1,9 +1,12 @@
-2.036000 - 
+2.035999_001 - 2017-05-17
 
   [NEW FEATURES]
 
-  * template_paths config to allow easier override of web templates
   * new ACL features including AND and negation
+  * named ACLs which can be used in other ACLs or *_only/*_no settings
+  * template_paths setting to allow very easy override of code and templates
+  * site_local_files setting for easy lib/template override (TODO: docs)
+  * support for device identity steering via device_identity (TODO: docs)
 
   [ENHANCEMENTTS]
 
@@ -14,6 +17,7 @@
 
   * Add SSL development library to Release Notes
   * #309 missing Device Port VLAN Mismatch CSV template
+  * fail safe on an empty *_no ACL
 
 2.035006 - 2017-04-29
 
diff --git a/META.json b/META.json
index 16398b81..dbae3504 100644
--- a/META.json
+++ b/META.json
@@ -99,7 +99,7 @@
    "provides" : {
       "App::Netdisco" : {
          "file" : "lib/App/Netdisco.pm",
-         "version" : "2.035006"
+         "version" : "2.035999_001"
       },
       "App::Netdisco::AnyEvent::Nbtstat" : {
          "file" : "lib/App/Netdisco/AnyEvent/Nbtstat.pm"
@@ -628,7 +628,7 @@
          "file" : "lib/Dancer/Template/NetdiscoTemplateToolkit.pm"
       }
    },
-   "release_status" : "stable",
+   "release_status" : "testing",
    "resources" : {
       "bugtracker" : {
          "web" : "https://github.com/netdisco/netdisco/issues"
@@ -643,6 +643,6 @@
       "x_IRC" : "irc://irc.freenode.org/#netdisco",
       "x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/netdisco-users"
    },
-   "version" : "2.035006",
+   "version" : "2.035999_001",
    "x_serialization_backend" : "JSON::PP version 2.27400"
 }
diff --git a/META.yml b/META.yml
index adb8cc8f..7bfffe04 100644
--- a/META.yml
+++ b/META.yml
@@ -18,7 +18,7 @@ name: App-Netdisco
 provides:
   App::Netdisco:
     file: lib/App/Netdisco.pm
-    version: '2.035006'
+    version: 2.035999_001
   App::Netdisco::AnyEvent::Nbtstat:
     file: lib/App/Netdisco/AnyEvent/Nbtstat.pm
   App::Netdisco::Backend::Job:
@@ -442,5 +442,5 @@ resources:
   homepage: http://netdisco.org/
   license: http://opensource.org/licenses/bsd-license.php
   repository: https://github.com/netdisco/netdisco
-version: '2.035006'
+version: 2.035999_001
 x_serialization_backend: 'CPAN::Meta::YAML version 0.011'
diff --git a/lib/App/Netdisco.pm b/lib/App/Netdisco.pm
index 7f20a2ca..562fe476 100644
--- a/lib/App/Netdisco.pm
+++ b/lib/App/Netdisco.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use 5.010_000;
 
-our $VERSION = '2.035006';
+our $VERSION = '2.035999_001';
 use App::Netdisco::Configuration;
 
 use Module::Find ();