diff -Naur maemo.orig/documentation/content/xdocs/n770/docs/howto_rootfs_initfs.xml maemo/documentation/content/xdocs/n770/docs/howto_rootfs_initfs.xml
--- maemo.orig/documentation/content/xdocs/n770/docs/howto_rootfs_initfs.xml	2007-01-11 18:47:12.998317600 +0100
+++ maemo/documentation/content/xdocs/n770/docs/howto_rootfs_initfs.xml	2007-01-11 22:52:10.703926720 +0100
@@ -25,9 +25,9 @@
   </steps>
   <references title="Integration Song">
     <p>
-      <link href="https://maemo.research.nokia.com/projects/integration/wiki/IntegrationSong">
+      <a href="https://maemo.research.nokia.com/projects/integration/wiki/IntegrationSong">
 	Integration Song from SI Team
-      </link>
+      </a>
     </p>
   </references>
 </howto>
diff -Naur maemo.orig/documentation/content/xdocs/tabs.xml maemo/documentation/content/xdocs/tabs.xml
--- maemo.orig/documentation/content/xdocs/tabs.xml	2007-01-11 18:47:12.982320032 +0100
+++ maemo/documentation/content/xdocs/tabs.xml	2007-01-11 22:53:42.046040608 +0100
@@ -14,8 +14,8 @@
   <tab id="home" label="Home" indexfile="index.html"/>
   <tab id="community" label="Developers" dir= "community/" indexfile="getting-involved.html"/>
   <tab id="downloads" label="Downloads" dir="downloads/" indexfile="releases.html"/>
-  <tab href="ext:maemo-wiki" label="Wiki"/>
-  <tab href="ext:maemo-planet" label="Planet"/>
-  <tab href="ext:maemo-garage" label="Garage"/>
-  <tab href="ext:maemo-appcatalog" label="Applications"/>
+  <tab href="http://maemo.org/maemowiki/" label="Wiki"/>
+  <tab href="http://planet.maemo.org/" label="Planet"/>
+  <tab href="https://garage.maemo.org/" label="Garage"/>
+  <tab href="http://maemo.org/maemowiki/ApplicationCatalog2006" label="Applications"/>
 </tabs>
diff -Naur maemo.orig/forrest.properties maemo/forrest.properties
--- maemo.orig/forrest.properties	2007-01-11 18:47:12.790349216 +0100
+++ maemo/forrest.properties	2007-01-11 22:51:41.484368768 +0100
@@ -1,4 +1,5 @@
-# Copyright 2002-2004 The Apache Software Foundation
+# Copyright 2002-2005 The Apache Software Foundation or its licensors,
+# as applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 
 ##############
 # Properties used by forrest.build.xml for building the website
-# These are the defaults, un-comment them if you need to change them.
+# These are the defaults, un-comment them only if you need to change them.
 ##############
 
 # Prints out a summary of Forrest settings for this project
@@ -23,11 +24,14 @@
 # Project name (used to name .war file)
 project.name=maemo_development_platform
 
-# Specifies name of the skin to use
+# Specifies name of Forrest skin to use
+# See list at http://forrest.apache.org/docs/skins.html
 project.skin=maemo
 
+# Descriptors for plugins and skins
 # comma separated list, file:// is supported
 forrest.skins.descriptors=file://./documentation/skins/skins.xml
+#forrest.plugins.descriptors=http://forrest.apache.org/plugins/plugins.xml,http://forrest.apache.org/plugins/whiteboard-plugins.xml
 
 ##############
 # behavioural properties
@@ -80,25 +84,48 @@
 # e.g.
 #forrest.validate.xdocs.excludes=samples/subdir/**, samples/faq.xml
 *.excludes=/downloads/testing/**, /downloads/stable/**, /downloads/*.php
-#forrest.validate.downloads.excludes=*.php
+#forrest.validate.xdocs.excludes=
+
 
 ##############
 # General Forrest properties
 
 # The URL to start crawling from
-project.start-uri=linkmap.html
+#project.start-uri=linkmap.html
+
 # Set logging level for messages printed to the console
 # (DEBUG, INFO, WARN, ERROR, FATAL_ERROR)
 project.debuglevel=ERROR
+
 # Max memory to allocate to Java
 forrest.maxmemory=128m
+
 # Any other arguments to pass to the JVM. For example, to run on an X-less
 # server, set to -Djava.awt.headless=true
 #forrest.jvmargs=
+
 # The bugtracking URL - the issue number will be appended
 #project.bugtracking-url=http://issues.apache.org/bugzilla/show_bug.cgi?id=
 #project.bugtracking-url=http://issues.apache.org/jira/browse/
+
 # The issues list as rss
 #project.issues-rss-url=
-#I18n Property only works for the "forrest run" target.
+
+#I18n Property. Based on the locale request for the browser.
+#If you want to use it for static site then modify the JVM system.language
+# and run once per language
 #project.i18n=true
+
+# The names of plugins that are required to build the project
+# comma separated list (no spaces)
+# You can request a specific version by appending "-VERSION" to the end of
+# the plugin name. If you exclude a version number the latest released version
+# will be used, however, be aware that this may be a development version. In
+# a production environment it is recomended that you specify a known working 
+# version.
+# Run "forrest available-plugins" for a list of plug-ins currently available
+project.required.plugins=org.apache.forrest.plugin.output.pdf
+
+# Proxy configuration
+# proxy.host=
+# proxy.port=
diff -Naur maemo.orig/scripts/build.sh maemo/scripts/build.sh
--- maemo.orig/scripts/build.sh	2007-01-11 18:47:12.790349216 +0100
+++ maemo/scripts/build.sh	2007-01-11 22:52:31.181813608 +0100
@@ -19,7 +19,7 @@
 E_MISSINGPROPERTIES=2;
 
 export JAVA_HOME=/opt/jre
-export FORREST_HOME=/opt/forrest/src/core
+export FORREST_HOME=/opt/forrest
 export PATH=${PATH}:${FORREST_HOME}/bin
 
 FORREST=`which forrest`;
