diff --git a/nifi-site/Gruntfile.js b/nifi-site/Gruntfile.js
index 782f5e4853..bead8b6bb2 100644
--- a/nifi-site/Gruntfile.js
+++ b/nifi-site/Gruntfile.js
@@ -129,7 +129,7 @@ module.exports = function (grunt) {
                     questions: [{
                             config: 'config.svn.username',
                             type: 'input',
-                            message: 'Enter SVN username if different from current user:'
+                            message: 'Enter SVN username (if different from current or configured user):'
                     }]
                 }
             },
@@ -160,7 +160,7 @@ module.exports = function (grunt) {
                     }, {
                             config: 'config.svn.password',
                             type: 'password',
-                            message: 'SVN password:'
+                            message: 'SVN password (if different from configured):'
                     }],
                     then: function () {
                         grunt.task.run('exec:commit');
@@ -185,11 +185,11 @@ module.exports = function (grunt) {
                 command: function() {
                     var url = grunt.config('config.svn.url');
                     var username = grunt.config('config.svn.username');
-                    if (username === '') {
-                        return 'svn checkout ' + url + ' --trust-server-cert --non-interactive dist';
-                    } else {
-                        return 'svn checkout --username ' + username + ' ' + url + ' --trust-server-cert --non-interactive dist';
+                    var command = 'svn checkout';
+                    if (username !== '') {
+                        command += (' --username ' + username);
                     }
+                    return command + ' ' + url + ' --trust-server-cert --non-interactive dist';
                 },
                 stdout: true,
                 stderr: true
@@ -212,11 +212,14 @@ module.exports = function (grunt) {
                     var username = grunt.config('config.svn.username');
                     var password = grunt.config('config.svn.password');
                     var message = grunt.config('config.svn.commit.message');
-                    if (username === '') {
-                        return 'svn commit --password "' + password + '" -m "' + message + '" --trust-server-cert --non-interactive .';
-                    } else {
-                        return 'svn commit --username ' + username + ' --password "' + password + '" -m "' + message + '" --trust-server-cert --non-interactive .';
+                    var command = 'svn commit';
+                    if (username !== '') {
+                        command += (' --username ' + username);
                     }
+                    if (password !== '') {
+                        command += (' --password ' + password);
+                    }
+                    return command + ' -m "' + message + '" --trust-server-cert --non-interactive .';
                 }
             }
         },
diff --git a/nifi-site/README.md b/nifi-site/README.md
index 3ba231b415..4b7906b25f 100644
--- a/nifi-site/README.md
+++ b/nifi-site/README.md
@@ -46,7 +46,8 @@ npm install
 The site is built using [foundation][] a responsive front end framework. 
 Consequently, the site is using [sass][] and [compass][] for CSS pre-processing.
 This will also require ruby to be installed along with sass and compass. Both
-sass and compass can be installed via ruby once it is installed.
+sass and compass can be installed via ruby once it is installed. In order to run
+gem install ruby-devel might also need to be installed.
 
 ```bash
 gem install compass