diff --git a/configure.ac b/configure.ac
index ccb829ecdb98a1a06cb3b2477676e76e47b64c0c..a2540cdf7d9ce2f1276d91d0b745d7be943999a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,6 @@ AC_CONFIG_FILES([Makefile
      dune/common/parallel/test/Makefile
      doc/Makefile
      doc/devel/Makefile
-     doc/layout/Makefile
      doc/doxygen/Makefile
      doc/doxygen/Doxyfile
      doc/buildsystem/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index adb9d348e0d343c0a33c6e83545de639e4a94d66..0f4948c8fce823cf6d20555139a9c4c222d0c2cf 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
 
 # also build these sub directories
-SUBDIRS = devel doxygen layout buildsystem
+SUBDIRS = devel doxygen buildsystem
 
 # only build html pages, if documentation is enabled
 if BUILD_DOCS
diff --git a/doc/layout/.gitignore b/doc/layout/.gitignore
deleted file mode 100644
index 55880268f2ad9f36919c5800c511bfd8ee056caa..0000000000000000000000000000000000000000
--- a/doc/layout/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-semantic.cache
\ No newline at end of file
diff --git a/doc/layout/Makefile.am b/doc/layout/Makefile.am
deleted file mode 100644
index 544db6654831d6e3a249d8692a12c931c3438c74..0000000000000000000000000000000000000000
--- a/doc/layout/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-
-EXTRA_DIST = default.wml
-
-# nothing to install
-web-install:
-
-include $(top_srcdir)/am/global-rules
diff --git a/doc/layout/default.wml b/doc/layout/default.wml
deleted file mode 100644
index fc2f2d9ff0b2d471734c02b33ffecc4ba8e13b84..0000000000000000000000000000000000000000
--- a/doc/layout/default.wml
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- html -*-
-# $Id$
-
-# simple page layout, can be replaced by full version for the
-# dune-website
-
-#use wml::std::tags
-
-
-## Page layout
-
-#use wml::layout::header
-#use wml::layout::navigation
-
-<body>
-  <dump BASIC_BODY>
-</body>
-
-## catch any content after this:
-
-{#BASIC_BODY#:
diff --git a/doc/layout/header.wml b/doc/layout/header.wml
deleted file mode 100644
index eca1e08e8de31ff05aebb4e92bfb68ac865f3d71..0000000000000000000000000000000000000000
--- a/doc/layout/header.wml
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- html -*-
-# $Id$
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"\
-  "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-
-<head>
-<title>$(title:-Untitled)</title>
-{#STYLESHEETS#}
-</head>
diff --git a/doc/layout/navigation.wml b/doc/layout/navigation.wml
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000