diff --git a/NEWS b/NEWS
index f30f405b..c49744bb 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@ NEWS
   * [ssl/build] some minor fixes; fix compile without ssl, cleanup ssl config buffers
   * [proc,include_shell] log error if exec shell fails (fixes #2280)
   * [*cgi] Use physical base dir (alias, userdir) as DOCUMENT_ROOT in cgi environments (fixes #2216)
+  * [doc] Move docs to outdated/ subdir and refer to wiki instead (fixes #2248)
 
 - 1.4.28 - 2010-08-22
   * Rename fdevent_event_add to _set to reflect what the function does. Fix some handlers. (fixes #2249)
diff --git a/README b/README
index 318da223..cb72e755 100644
--- a/README
+++ b/README
@@ -19,6 +19,9 @@ a light httpd
   URL-Rewriting and many more) make lighttpd the perfect webserver-software
   for every server that is suffering load problems.
 
+:documentation:
+  http://wiki.lighttpd.net/
+
 the naming
 ----------
 
diff --git a/configure.ac b/configure.ac
index 82327571..1498490b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -610,6 +610,7 @@ AC_CONFIG_FILES([Makefile src/Makefile
 		 doc/config/Makefile \
 		 doc/scripts/Makefile \
 		 doc/initscripts/Makefile \
+		 doc/outdated/Makefile \
 		 doc/Makefile \
 		 tests/Makefile \
 		 tests/docroot/Makefile \
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 52c7980a..40a170b3 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,101 +1,6 @@
-SUBDIRS=config scripts initscripts
+SUBDIRS=config scripts initscripts outdated
 dist_man8_MANS=lighttpd.8
 
-DOCS=accesslog.txt \
-authentication.txt \
-cgi.txt \
-compress.txt \
-configuration.txt \
-extforward.txt \
-fastcgi-state.txt \
-fastcgi.txt \
-features.txt \
-performance.txt \
-plugins.txt \
-proxy.txt \
-redirect.txt \
-rewrite.txt \
-secdownload.txt \
-security.txt \
-simple-vhost.txt \
-skeleton.txt \
-ssi.txt \
-ssl.txt \
-state.txt \
-rrdtool.txt \
-alias.txt \
-userdir.txt \
-mysqlvhost.txt \
-access.txt \
-traffic-shaping.txt \
-setenv.txt \
-status.txt \
-scgi.txt \
-cml.txt \
-trigger_b4_dl.txt \
-webdav.txt \
-expire.txt \
-dirlisting.txt \
-evhost.txt \
-magnet.txt
-
-HTMLDOCS=accesslog.html \
-	 authentication.html \
-	 cgi.html \
-	 compress.html \
-	 configuration.html \
-	 extforward.html \
-	 fastcgi-state.html \
-	 fastcgi.html \
-	 features.html \
-	 performance.html \
-	 plugins.html \
-	 proxy.html \
-	 redirect.html \
-	 rewrite.html \
-	 secdownload.html \
-	 security.html \
-	 simple-vhost.html \
-	 skeleton.html \
-	 ssi.html \
-	 ssl.html \
-	 state.html \
-	 rrdtool.html \
-	 alias.html \
-	 userdir.html \
-	 mysqlvhost.html \
-	 access.html \
-	 traffic-shaping.html \
-	 setenv.html \
-	 status.html \
-	 scgi.html \
-	 cml.html \
-	 trigger_b4_dl.html \
-	 webdav.html \
-	 expire.html \
-	 dirlisting.html \
-	 evhost.html \
-	 magnet.html
-
 EXTRA_DIST= \
-	state.dot fastcgi-state.dot \
 	newstyle.css \
-	oldstyle.css \
-	$(DOCS)
-
-.txt.html:
-	rst2html $^ > $@
-
-
-html-local: $(HTMLDOCS)
-
-#%.ps.gz: %.ps
-#	gzip $^
-
-#%.ps: %.dot
-#	dot -Tps -o $@ $^
-
-clean-local:
-	rm -f *.html
-
-
+	oldstyle.css
diff --git a/doc/outdated/Makefile.am b/doc/outdated/Makefile.am
new file mode 100644
index 00000000..861a6fd0
--- /dev/null
+++ b/doc/outdated/Makefile.am
@@ -0,0 +1,96 @@
+DOCS=accesslog.txt \
+authentication.txt \
+cgi.txt \
+compress.txt \
+configuration.txt \
+extforward.txt \
+fastcgi-state.txt \
+fastcgi.txt \
+features.txt \
+performance.txt \
+plugins.txt \
+proxy.txt \
+redirect.txt \
+rewrite.txt \
+secdownload.txt \
+security.txt \
+simple-vhost.txt \
+skeleton.txt \
+ssi.txt \
+ssl.txt \
+state.txt \
+rrdtool.txt \
+alias.txt \
+userdir.txt \
+mysqlvhost.txt \
+access.txt \
+traffic-shaping.txt \
+setenv.txt \
+status.txt \
+scgi.txt \
+cml.txt \
+trigger_b4_dl.txt \
+webdav.txt \
+expire.txt \
+dirlisting.txt \
+evhost.txt \
+magnet.txt
+
+HTMLDOCS=accesslog.html \
+	 authentication.html \
+	 cgi.html \
+	 compress.html \
+	 configuration.html \
+	 extforward.html \
+	 fastcgi-state.html \
+	 fastcgi.html \
+	 features.html \
+	 performance.html \
+	 plugins.html \
+	 proxy.html \
+	 redirect.html \
+	 rewrite.html \
+	 secdownload.html \
+	 security.html \
+	 simple-vhost.html \
+	 skeleton.html \
+	 ssi.html \
+	 ssl.html \
+	 state.html \
+	 rrdtool.html \
+	 alias.html \
+	 userdir.html \
+	 mysqlvhost.html \
+	 access.html \
+	 traffic-shaping.html \
+	 setenv.html \
+	 status.html \
+	 scgi.html \
+	 cml.html \
+	 trigger_b4_dl.html \
+	 webdav.html \
+	 expire.html \
+	 dirlisting.html \
+	 evhost.html \
+	 magnet.html
+
+EXTRA_DIST= \
+	state.dot fastcgi-state.dot \
+	$(DOCS)
+
+.txt.html:
+	rst2html $^ > $@
+
+
+html-local: $(HTMLDOCS)
+
+#%.ps.gz: %.ps
+#	gzip $^
+
+#%.ps: %.dot
+#	dot -Tps -o $@ $^
+
+clean-local:
+	rm -f *.html
+
+
diff --git a/doc/access.txt b/doc/outdated/access.txt
similarity index 100%
rename from doc/access.txt
rename to doc/outdated/access.txt
diff --git a/doc/accesslog.txt b/doc/outdated/accesslog.txt
similarity index 100%
rename from doc/accesslog.txt
rename to doc/outdated/accesslog.txt
diff --git a/doc/alias.txt b/doc/outdated/alias.txt
similarity index 100%
rename from doc/alias.txt
rename to doc/outdated/alias.txt
diff --git a/doc/authentication.txt b/doc/outdated/authentication.txt
similarity index 100%
rename from doc/authentication.txt
rename to doc/outdated/authentication.txt
diff --git a/doc/cgi.txt b/doc/outdated/cgi.txt
similarity index 100%
rename from doc/cgi.txt
rename to doc/outdated/cgi.txt
diff --git a/doc/cml.txt b/doc/outdated/cml.txt
similarity index 100%
rename from doc/cml.txt
rename to doc/outdated/cml.txt
diff --git a/doc/compress.txt b/doc/outdated/compress.txt
similarity index 100%
rename from doc/compress.txt
rename to doc/outdated/compress.txt
diff --git a/doc/configuration.txt b/doc/outdated/configuration.txt
similarity index 100%
rename from doc/configuration.txt
rename to doc/outdated/configuration.txt
diff --git a/doc/dirlisting.txt b/doc/outdated/dirlisting.txt
similarity index 100%
rename from doc/dirlisting.txt
rename to doc/outdated/dirlisting.txt
diff --git a/doc/evhost.txt b/doc/outdated/evhost.txt
similarity index 100%
rename from doc/evhost.txt
rename to doc/outdated/evhost.txt
diff --git a/doc/expire.txt b/doc/outdated/expire.txt
similarity index 100%
rename from doc/expire.txt
rename to doc/outdated/expire.txt
diff --git a/doc/extforward.txt b/doc/outdated/extforward.txt
similarity index 100%
rename from doc/extforward.txt
rename to doc/outdated/extforward.txt
diff --git a/doc/fastcgi-state.dot b/doc/outdated/fastcgi-state.dot
similarity index 100%
rename from doc/fastcgi-state.dot
rename to doc/outdated/fastcgi-state.dot
diff --git a/doc/fastcgi-state.txt b/doc/outdated/fastcgi-state.txt
similarity index 100%
rename from doc/fastcgi-state.txt
rename to doc/outdated/fastcgi-state.txt
diff --git a/doc/fastcgi.txt b/doc/outdated/fastcgi.txt
similarity index 100%
rename from doc/fastcgi.txt
rename to doc/outdated/fastcgi.txt
diff --git a/doc/features.txt b/doc/outdated/features.txt
similarity index 100%
rename from doc/features.txt
rename to doc/outdated/features.txt
diff --git a/doc/magnet.txt b/doc/outdated/magnet.txt
similarity index 100%
rename from doc/magnet.txt
rename to doc/outdated/magnet.txt
diff --git a/doc/mysqlvhost.txt b/doc/outdated/mysqlvhost.txt
similarity index 100%
rename from doc/mysqlvhost.txt
rename to doc/outdated/mysqlvhost.txt
diff --git a/doc/performance.txt b/doc/outdated/performance.txt
similarity index 100%
rename from doc/performance.txt
rename to doc/outdated/performance.txt
diff --git a/doc/plugins.txt b/doc/outdated/plugins.txt
similarity index 100%
rename from doc/plugins.txt
rename to doc/outdated/plugins.txt
diff --git a/doc/proxy.txt b/doc/outdated/proxy.txt
similarity index 100%
rename from doc/proxy.txt
rename to doc/outdated/proxy.txt
diff --git a/doc/redirect.txt b/doc/outdated/redirect.txt
similarity index 100%
rename from doc/redirect.txt
rename to doc/outdated/redirect.txt
diff --git a/doc/rewrite.txt b/doc/outdated/rewrite.txt
similarity index 100%
rename from doc/rewrite.txt
rename to doc/outdated/rewrite.txt
diff --git a/doc/rrdtool.txt b/doc/outdated/rrdtool.txt
similarity index 100%
rename from doc/rrdtool.txt
rename to doc/outdated/rrdtool.txt
diff --git a/doc/scgi.txt b/doc/outdated/scgi.txt
similarity index 100%
rename from doc/scgi.txt
rename to doc/outdated/scgi.txt
diff --git a/doc/secdownload.txt b/doc/outdated/secdownload.txt
similarity index 100%
rename from doc/secdownload.txt
rename to doc/outdated/secdownload.txt
diff --git a/doc/security.txt b/doc/outdated/security.txt
similarity index 100%
rename from doc/security.txt
rename to doc/outdated/security.txt
diff --git a/doc/setenv.txt b/doc/outdated/setenv.txt
similarity index 100%
rename from doc/setenv.txt
rename to doc/outdated/setenv.txt
diff --git a/doc/simple-vhost.txt b/doc/outdated/simple-vhost.txt
similarity index 100%
rename from doc/simple-vhost.txt
rename to doc/outdated/simple-vhost.txt
diff --git a/doc/skeleton.txt b/doc/outdated/skeleton.txt
similarity index 100%
rename from doc/skeleton.txt
rename to doc/outdated/skeleton.txt
diff --git a/doc/ssi.txt b/doc/outdated/ssi.txt
similarity index 100%
rename from doc/ssi.txt
rename to doc/outdated/ssi.txt
diff --git a/doc/ssl.txt b/doc/outdated/ssl.txt
similarity index 100%
rename from doc/ssl.txt
rename to doc/outdated/ssl.txt
diff --git a/doc/state.dot b/doc/outdated/state.dot
similarity index 100%
rename from doc/state.dot
rename to doc/outdated/state.dot
diff --git a/doc/state.txt b/doc/outdated/state.txt
similarity index 100%
rename from doc/state.txt
rename to doc/outdated/state.txt
diff --git a/doc/status.txt b/doc/outdated/status.txt
similarity index 100%
rename from doc/status.txt
rename to doc/outdated/status.txt
diff --git a/doc/traffic-shaping.txt b/doc/outdated/traffic-shaping.txt
similarity index 100%
rename from doc/traffic-shaping.txt
rename to doc/outdated/traffic-shaping.txt
diff --git a/doc/trigger_b4_dl.txt b/doc/outdated/trigger_b4_dl.txt
similarity index 100%
rename from doc/trigger_b4_dl.txt
rename to doc/outdated/trigger_b4_dl.txt
diff --git a/doc/userdir.txt b/doc/outdated/userdir.txt
similarity index 100%
rename from doc/userdir.txt
rename to doc/outdated/userdir.txt
diff --git a/doc/webdav.txt b/doc/outdated/webdav.txt
similarity index 100%
rename from doc/webdav.txt
rename to doc/outdated/webdav.txt