diff --git a/xdocs/nightlies.xml b/xdocs/nightlies.xml
index bce90820f..b8a5c1598 100644
--- a/xdocs/nightlies.xml
+++ b/xdocs/nightlies.xml
@@ -36,12 +36,36 @@ href="http://svn.apache.org/snapshots/ant/">Subversion snapshot</a>.</p>
 
 <section name="Continuous Builds">
 
-<p>JetBrains is offering Ant the service of a Continuous Build on
-their TeamCity system.  Note that these are no official builds and
-they are not endorsed or even supported by the Ant team.  You can
-directly access the builds of Ant and Ivy:</p>
+<p>Ant and Ivy are using Continous Integrations systems to improve the development process.
+Note that these are no official builds and they are not endorsed or even supported by the Ant team.
+But if you have problems with <i>testing</i> the latest (successful) build, you are welcome to post
+that on the <a href="mail.html#Developer%20List:%20dev@ant.apache.org">developer mailinglist</a>.
+You can directly access the builds of Ant and Ivy on these CI installations:</p>
 
-<teamcity viewlog="http://teamcity.jetbrains.com/viewLog.html">
+<p>The Apache Software Foundation <a href="http://hudson.zones.apache.org/hudson/">hosts</a> an
+installation of the <a href="http://hudson.dev.java.net/">Hudson</a> CI-system which Ant + Ivy
+<a href="http://hudson.zones.apache.org/hudson/view/Ant/">use</a>.</p>
+
+<!-- TODO: insert the job commands  //job/@command  -->
+<hudson base="http://hudson.zones.apache.org/hudson/view/Ant/">
+    <project name="Apache Ant">
+    </project>
+    <project name="Apache Ivy">
+        <job id="Ivy" title="Ivy Core Trunk" command="">
+            <description>current development</description>
+        </job>
+        <job id="IvyDE" title="IvyDE Trunk" command="">
+            <description>current development</description>
+        </job>
+        <job id="IvyDE-updatesite" title="Eclipse Updatesite" command="">
+            <description>Update your Eclipse installation with the latest Ivy/IvyDE</description>
+        </job>
+    </project>
+</hudson>
+
+<p>JetBrains is offering Ant the service of a Continuous Build on their TeamCity system.</p>
+
+<teamcity viewlog="http://teamcity.jetbrains.com/guestAuth/viewLog.html">
     <project name="Apache Ant">
         <configuration id="bt133" title="Core Trunk (Windows)" command="clean test">
             <description>current development (Windows platform)</description>
diff --git a/xdocs/stylesheets/site.vsl b/xdocs/stylesheets/site.vsl
index 419ce5b0f..57c8f2531 100644
--- a/xdocs/stylesheets/site.vsl
+++ b/xdocs/stylesheets/site.vsl
@@ -140,6 +140,47 @@
     </tr>
 #end
 
+## The hudson macro is based on the teamcity macro, but slightly different.
+## Mainly in the need of another nested element (job instead of configuration).
+## Maybe refactoring would ease that code ...
+#macro ( hudson $hudson)
+    <table class="ContinuousBuild">
+    <tr>
+      <th>Title</th>
+      <th>Description</th>
+      <th>Build command</th>
+      <th>When</th>
+      <th>last build</th>
+      <th>last success</th>
+    </tr>
+    #set ($base = $hudson.getAttributeValue("base") )
+    #foreach ($project in $hudson.getChildren() )
+    <tr><td colspan="6" class="title"><b>$project.getAttributeValue("name")</b></td></tr>
+        #foreach ($job in $project.getChildren() )
+            #job ($job $base)
+        #end
+    #end
+    </table>
+#end
+
+## The hudson::job macro is based on the teamcity::configuration macro, but slightly different.
+## Mainly the links to the build results are different.
+#macro ( job $job $base)
+    #set ($jobId = $job.getAttributeValue("id")                         )
+    <tr>
+      <td class="title">$job.getAttributeValue("title")</td>
+      <td class="description">$job.getChild("description").getContent()</td>
+      <td class="command">$job.getAttributeValue("command")</td>
+      #if ($job.getChild("when"))
+        <td class="when">$job.getChild("when").getContent()</td>
+      #else
+        <td class="when">continuously</td>
+      #end
+      <td class="link"><a href="$base/$jobId/lastBuild/">last build</a></td>
+      <td class="link"><a href="$base/$jobId/lastSuccessfulBuild/">last success</a></td>
+    </tr>
+#end
+
 #macro ( section $section)
     <h3 class="section">
       <a name="$escape.getText($section.getAttributeValue("name"))"></a>
@@ -156,6 +197,8 @@
           #subsection ($items)
         #elseif ($items.getName().equals("teamcity"))
           #teamcity ($items)
+        #elseif ($items.getName().equals("hudson"))
+          #hudson ($items)
         #else
           $xmlout.outputString($items)
         #end