diff --git a/Netdisco/Changes b/Netdisco/Changes
index 3d681fdf..add247f5 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -1,3 +1,13 @@
+2.031009 - 2015-02-25
+
+  [ENHANCEMENTS]
+
+  * Support NETDISCO_DBNAME env var to override database name
+
+  [BUG FIXES]
+
+  * Permit whitespace in usernames (for LDAP support)
+
 2.031008 - 2015-02-22
 
   [ENHANCEMENTS]
diff --git a/Netdisco/lib/App/Netdisco/Configuration.pm b/Netdisco/lib/App/Netdisco/Configuration.pm
index 514566e7..4da11670 100644
--- a/Netdisco/lib/App/Netdisco/Configuration.pm
+++ b/Netdisco/lib/App/Netdisco/Configuration.pm
@@ -10,7 +10,7 @@ BEGIN {
 
 # set up database schema config from simple config vars
 if (ref {} eq ref setting('database')) {
-    my $name = (setting('database')->{name} || 'netdisco');
+    my $name = ($ENV{NETDISCO_DBNAME} || setting('database')->{name} || 'netdisco');
     my $host = setting('database')->{host};
     my $user = setting('database')->{user};
     my $pass = setting('database')->{pass};