diff --git a/wiki/setting-up-jenkins-on-sap-monsoon.md b/wiki/setting-up-jenkins-on-sap-monsoon.md
index aac9e85151a..dae3b46dd36 100644
--- a/wiki/setting-up-jenkins-on-sap-monsoon.md
+++ b/wiki/setting-up-jenkins-on-sap-monsoon.md
@@ -36,6 +36,52 @@ Add the following to the Maven configuration file at ``/home/jenkins/.m2/setting
         </proxies>
 ```
 
+## toolchains.xml and Maven version
+
+To avoid the warnings that the Bundle-RequiredExecutionEnvironment doesn't match the compiler version, the Maven construct of ``~/.m2/toolchains.xml`` can be used. However, the Maven version 3.3.3 built into Jenkins doesn't seem to properly respect the toolchains.xml file under /home/jenkins/.m2/. Installing Maven using ``apt-get install maven`` results in a Maven 3.0.5 being installed (is this sufficiently new?). Running from the command line or configuring this external maven version in Jenkins does the job.
+
+Well, almost: the toolchains.xml file must point to the jre/ subdirectories, not the main JDK directories. This is pretty counter-intuitive and inconsistent with all examples found of the the toolchains.xml uses. Here is the toolchains.xml content that now is under /home/jenkins/.m2 and which works:
+
+```
+<?xml version="1.0" encoding="UTF8"?>
+<toolchains>
+  <!-- JDK toolchains -->
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <version>1.6</version>
+      <id>JavaSE-1.6</id>
+      <vendor>sun</vendor>
+    </provides>
+    <configuration>
+      <jdkHome>/usr/java/jdk1.6.0_51/jre</jdkHome>
+    </configuration>
+  </toolchain>
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <version>1.7</version>
+      <id>JavaSE-1.7</id>
+      <vendor>sun</vendor>
+    </provides>
+    <configuration>
+      <jdkHome>/usr/java/jdk1.7.0_80/jre</jdkHome>
+    </configuration>
+  </toolchain>
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <version>1.8</version>
+      <id>JavaSE-1.8</id>
+      <vendor>sun</vendor>
+    </provides>
+    <configuration>
+      <jdkHome>/usr/java/jdk1.8.0_51/jre</jdkHome>
+    </configuration>
+  </toolchain>
+</toolchains>
+```
+
 ## Git access
 
 There is now HTTPS git access on https://git.sapsailing.com/git which maps to the Git repository at /home/trac/git. Valid user accounts for HTTP basic authentication are provided in `/etc/httpd/conf/passwd.git` which can be manipulated using the `htpasswd` tool. One default user `replicate` has been established to mirror the repository to the SAP-internal Git at `git.wdf.sap.corp`.
\ No newline at end of file