diff --git a/docs/en-US/ipv6-support.xml b/docs/en-US/ipv6-support.xml
index 7367ec9ad80..c7f7744393e 100644
--- a/docs/en-US/ipv6-support.xml
+++ b/docs/en-US/ipv6-support.xml
@@ -75,8 +75,8 @@
       </listitem>
       <listitem>
         <para>Use the System VM template exclusively designed to support IPv6. Download the System
-          VM template from <ulink url="http://nfs1.lab.vmops.com/templates/routing/debian/ipv6/"
-            >http://nfs1.lab.vmops.com/templates/routing/debian/ipv6/</ulink>.</para>
+          VM template from <ulink url="http://cloudstack.apt-get.eu/systemvm/"
+            >http://cloudstack.apt-get.eu/systemvm/</ulink>.</para>
       </listitem>
       <listitem>
         <para>The concept of Default Network applies to IPv6 networks. However, unlike IPv4
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 596387f100e..404afecf2cd 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -729,7 +729,8 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
         if (systemVmIsoPath == null) {
             throw new CloudRuntimeException("Unable to find systemvm iso vms/systemvm.iso");
         }
-        final Script command = new Script("/bin/bash " + scriptPath, s_logger);
+        final Script command = new Script("/bin/bash", s_logger);
+        command.add(scriptPath);
         command.add(publicKeyPath);
         command.add(privKeyPath);
         command.add(systemVmIsoPath);