diff --git a/configure.ac b/configure.ac
index 9596f41..db0855e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,7 +121,7 @@ AC_CONFIG_FILES([Makefile
 		 cursor/wayland-cursor.pc
 		 cursor/wayland-cursor-uninstalled.pc
 		 doc/Makefile
-		 doc/Wayland/Makefile
+		 doc/publican/Makefile
 		 doc/doxygen/Makefile
 		 doc/man/Makefile
 		 src/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index b437de8..1efd3e2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1 +1 @@
-SUBDIRS = doxygen Wayland man
+SUBDIRS = doxygen publican man
diff --git a/doc/Wayland/.gitignore b/doc/publican/.gitignore
similarity index 100%
rename from doc/Wayland/.gitignore
rename to doc/publican/.gitignore
diff --git a/doc/Wayland/Makefile.am b/doc/publican/Makefile.am
similarity index 100%
rename from doc/Wayland/Makefile.am
rename to doc/publican/Makefile.am
diff --git a/doc/Wayland/doxygen-to-publican.xsl b/doc/publican/doxygen-to-publican.xsl
similarity index 100%
rename from doc/Wayland/doxygen-to-publican.xsl
rename to doc/publican/doxygen-to-publican.xsl
diff --git a/doc/Wayland/protocol-interfaces-to-docbook.xsl b/doc/publican/protocol-interfaces-to-docbook.xsl
similarity index 100%
rename from doc/Wayland/protocol-interfaces-to-docbook.xsl
rename to doc/publican/protocol-interfaces-to-docbook.xsl
diff --git a/doc/Wayland/protocol-to-docbook.xsl b/doc/publican/protocol-to-docbook.xsl
similarity index 100%
rename from doc/Wayland/protocol-to-docbook.xsl
rename to doc/publican/protocol-to-docbook.xsl
diff --git a/doc/Wayland/publican.cfg b/doc/publican/publican.cfg
similarity index 100%
rename from doc/Wayland/publican.cfg
rename to doc/publican/publican.cfg
diff --git a/doc/Wayland/sources/Architecture.xml b/doc/publican/sources/Architecture.xml
similarity index 100%
rename from doc/Wayland/sources/Architecture.xml
rename to doc/publican/sources/Architecture.xml
diff --git a/doc/Wayland/sources/Author_Group.xml b/doc/publican/sources/Author_Group.xml
similarity index 100%
rename from doc/Wayland/sources/Author_Group.xml
rename to doc/publican/sources/Author_Group.xml
diff --git a/doc/Wayland/sources/Book_Info.xml b/doc/publican/sources/Book_Info.xml
similarity index 100%
rename from doc/Wayland/sources/Book_Info.xml
rename to doc/publican/sources/Book_Info.xml
diff --git a/doc/Wayland/sources/Compositors.xml b/doc/publican/sources/Compositors.xml
similarity index 100%
rename from doc/Wayland/sources/Compositors.xml
rename to doc/publican/sources/Compositors.xml
diff --git a/doc/Wayland/sources/Foreword.xml b/doc/publican/sources/Foreword.xml
similarity index 100%
rename from doc/Wayland/sources/Foreword.xml
rename to doc/publican/sources/Foreword.xml
diff --git a/doc/Wayland/sources/Introduction.xml b/doc/publican/sources/Introduction.xml
similarity index 100%
rename from doc/Wayland/sources/Introduction.xml
rename to doc/publican/sources/Introduction.xml
diff --git a/doc/Wayland/sources/Library.xml b/doc/publican/sources/Library.xml
similarity index 100%
rename from doc/Wayland/sources/Library.xml
rename to doc/publican/sources/Library.xml
diff --git a/doc/Wayland/sources/Preface.xml b/doc/publican/sources/Preface.xml
similarity index 100%
rename from doc/Wayland/sources/Preface.xml
rename to doc/publican/sources/Preface.xml
diff --git a/doc/Wayland/sources/Protocol.xml b/doc/publican/sources/Protocol.xml
similarity index 100%
rename from doc/Wayland/sources/Protocol.xml
rename to doc/publican/sources/Protocol.xml
diff --git a/doc/Wayland/sources/Revision_History.xml b/doc/publican/sources/Revision_History.xml
similarity index 100%
rename from doc/Wayland/sources/Revision_History.xml
rename to doc/publican/sources/Revision_History.xml
diff --git a/doc/Wayland/sources/Wayland.ent b/doc/publican/sources/Wayland.ent
similarity index 100%
rename from doc/Wayland/sources/Wayland.ent
rename to doc/publican/sources/Wayland.ent
diff --git a/doc/Wayland/sources/Wayland.xml b/doc/publican/sources/Wayland.xml
similarity index 100%
rename from doc/Wayland/sources/Wayland.xml
rename to doc/publican/sources/Wayland.xml
diff --git a/doc/Wayland/sources/images/icon.svg b/doc/publican/sources/images/icon.svg
similarity index 100%
rename from doc/Wayland/sources/images/icon.svg
rename to doc/publican/sources/images/icon.svg
diff --git a/doc/Wayland/sources/images/wayland-architecture.png b/doc/publican/sources/images/wayland-architecture.png
similarity index 100%
rename from doc/Wayland/sources/images/wayland-architecture.png
rename to doc/publican/sources/images/wayland-architecture.png
diff --git a/doc/Wayland/sources/images/wayland.png b/doc/publican/sources/images/wayland.png
similarity index 100%
rename from doc/Wayland/sources/images/wayland.png
rename to doc/publican/sources/images/wayland.png
diff --git a/doc/Wayland/sources/images/x-architecture.png b/doc/publican/sources/images/x-architecture.png
similarity index 100%
rename from doc/Wayland/sources/images/x-architecture.png
rename to doc/publican/sources/images/x-architecture.png