diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index 891826c68c..fe61677c6a 100644
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -29,7 +29,7 @@
     DO dump the config using cfgtool to system_config
     after modifying this file.
 
-    ./waf && build/cfgtool/cfgtool system_config
+    ./waf && gtk2_ardour/arcfg system_config
 *****************************************************/
 
 /* IO connection */
diff --git a/system_config b/system_config
index d136ab945d..82fb5e9df1 100644
--- a/system_config
+++ b/system_config
@@ -84,6 +84,7 @@
     <Option name="shuttle-speed-threshold" value="5"/>
     <Option name="shuttle-behaviour" value="0"/>
     <Option name="shuttle-units" value="0"/>
+    <Option name="shuttle-max-speed" value="8"/>
     <Option name="locate-while-waiting-for-sync" value="0"/>
     <Option name="disable-disarm-during-roll" value="0"/>
     <Option name="meter-falloff" value="13.3"/>
@@ -119,7 +120,7 @@
     <Option name="denormal-protection" value="0"/>
     <Option name="denormal-model" value="3"/>
     <Option name="osx-pingback-url" value="http://community.ardour.org/pingback/osx/"/>
-    <Option name="tutorial-manual-url" value="http://ardour.org/flossmanual"/>
+    <Option name="tutorial-manual-url" value="http://ardour.org/tutorial"/>
     <Option name="reference-manual-url" value="http://manual.ardour.org/"/>
     <Option name="video-advanced-setup" value="0"/>
     <Option name="video-server-url" value="http://localhost:1554"/>