diff --git a/.editorconfig b/.editorconfig
index 91575c032..347aa2f58 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -17,6 +17,9 @@ trim_trailing_whitespace = false
 indent_size = 2
 indent_style = space
 
+[composer.json]
+indent_size = 4
+
 # Don't perform any clean-up on thirdparty files
 
 [thirdparty/**]
diff --git a/composer.json b/composer.json
index 4741da68d..0dd72ee7b 100644
--- a/composer.json
+++ b/composer.json
@@ -52,7 +52,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7",
-        "silverstripe/versioned": "^1.0@dev",
+        "silverstripe/versioned": "^1@dev",
         "silverstripe/behat-extension": "^3",
         "silverstripe/serve": "dev-master",
         "se/selenium-server-standalone": "2.41.0"