diff --git a/modules/elmsubmit/doc/admin/Makefile.am b/modules/elmsubmit/doc/admin/Makefile.am
index 427e3cfc4..c6c206689 100644
--- a/modules/elmsubmit/doc/admin/Makefile.am
+++ b/modules/elmsubmit/doc/admin/Makefile.am
@@ -1,31 +1,37 @@
 ## $Id$
 
 ## This file is part of CDS Invenio.
 ## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 CERN.
 ##
 ## CDS Invenio is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License as
 ## published by the Free Software Foundation; either version 2 of the
 ## License, or (at your option) any later version.
 ##
 ## CDS Invenio is distributed in the hope that it will be useful, but
 ## WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.  
+## General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with CDS Invenio; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 docdir = $(localstatedir)/www/admin/elmsubmit
 
 doc_DATA = index.html guide.html
 
+webdoclibdir = $(libdir)/webdoc/admin
+
+webdoclib_DATA = \
+	elmsubmit-admin.webdoc \
+	elmsubmit-admin-guide.webdoc
+
 FILESWML   = $(wildcard $(srcdir)/*.wml)
-EXTRA_DIST = $(FILESWML:$(srcdir)/%=%)
+EXTRA_DIST = $(webdoclib_DATA)
 
-CLEANFILES = $(doc_DATA) *~ *.tmp
+CLEANFILES = *~ *.tmp
 
 %.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(top_srcdir)/config/cdsnavbar.wml
 	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
 	$(PYTHON) $(top_srcdir)/po/i18n_update_wml_target.py en $@
\ No newline at end of file
diff --git a/modules/elmsubmit/doc/admin/Makefile.am b/modules/elmsubmit/doc/admin/elmsubmit-admin-guide.webdoc
similarity index 62%
copy from modules/elmsubmit/doc/admin/Makefile.am
copy to modules/elmsubmit/doc/admin/elmsubmit-admin-guide.webdoc
index 427e3cfc4..d8c0735ca 100644
--- a/modules/elmsubmit/doc/admin/Makefile.am
+++ b/modules/elmsubmit/doc/admin/elmsubmit-admin-guide.webdoc
@@ -1,31 +1,26 @@
 ## $Id$
 
 ## This file is part of CDS Invenio.
 ## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 CERN.
 ##
 ## CDS Invenio is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License as
 ## published by the Free Software Foundation; either version 2 of the
 ## License, or (at your option) any later version.
 ##
 ## CDS Invenio is distributed in the hope that it will be useful, but
 ## WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.  
+## General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with CDS Invenio; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
-docdir = $(localstatedir)/www/admin/elmsubmit
+<!-- WebDoc-Page-Title: ElmSubmit Admin Guide -->
+<!-- WebDoc-Page-Navbar-Name: admin -->
+<!-- WebDoc-Page-Navtrail: <a class="navtrail" href="<WEBURL>/admin/index.<lang:current/>.html">_(Admin Area)_</a> &gt; <a class="navtrail" href="elmsubmit-admin">ElmSubmit Admin</a> -->
+<!-- WebDoc-Page-Navbar-Select: elsubmit-admin-guide -->
+<!-- WebDoc-Page-Revision: $Id$-->
 
-doc_DATA = index.html guide.html
-
-FILESWML   = $(wildcard $(srcdir)/*.wml)
-EXTRA_DIST = $(FILESWML:$(srcdir)/%=%)
-
-CLEANFILES = $(doc_DATA) *~ *.tmp
-
-%.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(top_srcdir)/config/cdsnavbar.wml
-	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
-	$(PYTHON) $(top_srcdir)/po/i18n_update_wml_target.py en $@
\ No newline at end of file
+FIXME.
diff --git a/modules/elmsubmit/doc/admin/Makefile.am b/modules/elmsubmit/doc/admin/elmsubmit-admin.webdoc
similarity index 62%
copy from modules/elmsubmit/doc/admin/Makefile.am
copy to modules/elmsubmit/doc/admin/elmsubmit-admin.webdoc
index 427e3cfc4..cf8b58b39 100644
--- a/modules/elmsubmit/doc/admin/Makefile.am
+++ b/modules/elmsubmit/doc/admin/elmsubmit-admin.webdoc
@@ -1,31 +1,29 @@
 ## $Id$
 
 ## This file is part of CDS Invenio.
 ## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 CERN.
 ##
 ## CDS Invenio is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License as
 ## published by the Free Software Foundation; either version 2 of the
 ## License, or (at your option) any later version.
 ##
 ## CDS Invenio is distributed in the hope that it will be useful, but
 ## WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.  
+## General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with CDS Invenio; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
-docdir = $(localstatedir)/www/admin/elmsubmit
+<!-- WebDoc-Page-Title: ElmSubmit Admin -->
+<!-- WebDoc-Page-Navbar-Name: admin -->
+<!-- WebDoc-Page-Navtrail: <a class="navtrail" href="<WEBURL>/admin/index.<lang:current/>.html">_(Admin Area)_</a> -->
+<!-- WebDoc-Page-Navbar-Select: elsubmit -->
 
-doc_DATA = index.html guide.html
 
-FILESWML   = $(wildcard $(srcdir)/*.wml)
-EXTRA_DIST = $(FILESWML:$(srcdir)/%=%)
-
-CLEANFILES = $(doc_DATA) *~ *.tmp
-
-%.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(top_srcdir)/config/cdsnavbar.wml
-	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
-	$(PYTHON) $(top_srcdir)/po/i18n_update_wml_target.py en $@
\ No newline at end of file
+<dl>
+ <dt><a href="elmsubmit-admin-guide">ElmSubmit Admin Guide</a></dt>
+ <dd>Everything you want to know about ElmSubmit administration</dd>
+</dl>