diff --git a/Tools/autotest/param_metadata/htmlemit.py b/Tools/autotest/param_metadata/htmlemit.py
index 7c8f6af09d..b7f6ab9f37 100644
--- a/Tools/autotest/param_metadata/htmlemit.py
+++ b/Tools/autotest/param_metadata/htmlemit.py
@@ -17,11 +17,16 @@ This page was generated using Tools/autotest/param_metadata/param_parse.py
 DO NOT EDIT
 -->
 
-<!-- add auto-generated table of contents with "Table of Contents Plus" plugin -->
+
+<p style="text-align: right"><a title="Table of Contents" href="/wiki/table-of-contents/"><span style="font-size: medium"><strong>Reference Manual Table of Contents</strong></span></a></p>
+<h3 style="text-align: center">Complete Parameter List</h3>
+<hr />
 
 <p>This is a complete list of the parameters which can be set via the MAVLink protocol in the EEPROM of your APM to control vehicle behaviour. This list is automatically generated from the latest ardupilot source code, and so may contain parameters which are not yet in the stable released versions of the code.</p>
 
-[toc]\n
+<!-- add auto-generated table of contents with "Table of Contents Plus" plugin -->
+[toc exclude="Complete Parameter List"]
+
 '''        
         self.t = ''
 
diff --git a/Tools/scripts/build_autotest.sh b/Tools/scripts/build_autotest.sh
index 13a5c8395b..baea921487 100755
--- a/Tools/scripts/build_autotest.sh
+++ b/Tools/scripts/build_autotest.sh
@@ -116,7 +116,7 @@ mkdir -p "buildlogs/history/$hdate"
 (cd buildlogs && cp -f *.txt *.flashlog *.tlog *.km[lz] *.gpx *.html *.png "history/$hdate/")
 echo $githash > "buildlogs/history/$hdate/githash.txt"
 
-APM/Tools/scripts/build_parameters.sh
+(cd APM && Tools/scripts/build_parameters.sh)
 
 timelimit 4700 APM/Tools/autotest/autotest.py --timeout=4500 > buildlogs/autotest-output.txt 2>&1
 
diff --git a/Tools/scripts/build_parameters.sh b/Tools/scripts/build_parameters.sh
index 8ab2929f3f..9a2fbf5385 100755
--- a/Tools/scripts/build_parameters.sh
+++ b/Tools/scripts/build_parameters.sh
@@ -2,7 +2,9 @@
 
 set -e
 
-cd APM
+# work from either APM directory or above
+[ -d ArduPlane ] || cd APM
+
 ./Tools/autotest/param_metadata/param_parse.py > param.out || exit 1
 /bin/mkdir -p ../buildlogs/Parameters
 /bin/cp Parameters.wiki Parameters.html *.pdef.xml ../buildlogs/Parameters/