diff --git a/.mvn/maven.config b/.mvn/maven.config
deleted file mode 100644
index 202d48fe7..000000000
--- a/.mvn/maven.config
+++ /dev/null
@@ -1,3 +0,0 @@
---show-version
--T
-4
\ No newline at end of file
diff --git a/extension/fileupload/src/site/markdown/index.md b/extension/fileupload/src/site/markdown/index.md
index 7b5a1e7b5..7afd6dac6 100644
--- a/extension/fileupload/src/site/markdown/index.md
+++ b/extension/fileupload/src/site/markdown/index.md
@@ -12,8 +12,7 @@ file upload. This extension is available by default for the following runtimes:
The following configuration parameters are available:
1. `cloud.piranha.extension.fileupload.outputDirectory` - the directory where
- the file upload will store temporary files. The default is the same location
- as the ServletContext TEMPDIR.
+ the file upload will store temporary files. The default is the location as
1. `cloud.piranha.extension.fileupload.fileSizeTreshold` - the file size
threshold (in bytes) before the runtime will create a temporary file on the
diff --git a/extension/tempdir/pom.xml b/extension/tempdir/pom.xml
index 48e0498a4..6a6871354 100644
--- a/extension/tempdir/pom.xml
+++ b/extension/tempdir/pom.xml
@@ -39,4 +39,10 @@
test
+
+
+ default
+ file:///tmp/piranha/extension/tempdir/
+
+
diff --git a/extension/tempdir/src/site/markdown/index.md b/extension/tempdir/src/site/markdown/index.md
new file mode 100644
index 000000000..0133e3a7f
--- /dev/null
+++ b/extension/tempdir/src/site/markdown/index.md
@@ -0,0 +1,10 @@
+# Piranha TEMPDIR Extension
+
+The TEMPDIR extension delivers the ability for a Piranha runtime to support
+the Servlet temporary directory. This extension is available by default for the
+following runtimes:
+
+1. Piranha Server
+1. Piranha Servlet
+1. Piranha Web Profile
+
diff --git a/extension/tempdir/src/site/site.xml b/extension/tempdir/src/site/site.xml
new file mode 100644
index 000000000..3f0936968
--- /dev/null
+++ b/extension/tempdir/src/site/site.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
diff --git a/src/site/site.xml b/src/site/site.xml
index cda5da3cd..e0a305e7d 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -36,6 +36,7 @@