diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
index 009ab36..e098dd7 100644
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@@ -11,6 +11,11 @@ Maintainers:
 Change Log
 ----------
 
+### [0.6.1](https://github.com/marcuswhybrow/minecraft-server-manager/compare/0.6.0...0.6.1)
+
+* Fixed `test.sh` to use new settings names.
+
+
 ### [0.6.0](https://github.com/marcuswhybrow/minecraft-server-manager/compare/0.5.2...0.6.0)
 
 * Added new command `msm config` which displays a key value list of all MSM settings in use. Useful for transparency.
diff --git a/init/msm b/init/msm
index bf017a9..cc1911c 100755
--- a/init/msm
+++ b/init/msm
@@ -25,7 +25,7 @@ CONF="${MSM_CONF:-/etc/msm.conf}"
 
 
 ### The Minecraft Server Manager version, use "msm version" to check yours.
-VERSION="0.6.0"
+VERSION="0.6.1"
 
 
 ### Config variables the user should not need/want to change
@@ -2165,7 +2165,7 @@ server_init() {
 				value="${SERVER_PATH[$1]}/$value"
 			fi
 		fi
-		
+
 		eval SERVER_${name}[$1]=\"${value}\"
 	done