diff --git a/modules/webcomment/doc/admin/Makefile.am b/modules/webcomment/doc/admin/Makefile.am
index 8b0fa9d79..7f16e493d 100644
--- a/modules/webcomment/doc/admin/Makefile.am
+++ b/modules/webcomment/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/webcomment
 
 doc_DATA = index.html guide.html
 
+webdoclibdir = $(libdir)/webdoc/admin
+
+webdoclib_DATA = \
+	webcomment-admin.webdoc \
+	webcomment-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/webcomment/doc/admin/guide.html.wml b/modules/webcomment/doc/admin/guide.html.wml
index 2d8568c28..1bebddcc1 100644
--- a/modules/webcomment/doc/admin/guide.html.wml
+++ b/modules/webcomment/doc/admin/guide.html.wml
@@ -1,27 +1,26 @@
 ## -*- mode: html; coding: utf-8; -*-
 ## $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.
 ##
 ## 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.
 
-#include "cdspage.wml" \
-    title="WebComment Admin Guide" \
-    navtrail_previous_links="<a class=navtrail href=<WEBURL>/admin/<lang:star: index.*.html>>_(Admin Area)_</a> &gt; <a class=navtrail href=<WEBURL>/admin/webcomment/>WebComment Admin</a>" \
-    navbar_name="admin" \
-    navbar_select="webcomment-admin-guide"
+<title>WebComment Admin Guide</title>
+<navbar_name>admin</navbar_name>
+<navtrail_previous_links><a class="navtrail" href="<WEBURL>/admin/<lang:star: index.*.html>">_(Admin Area)_</a> &gt; <a class="navtrail" href="<WEBURL>/admin/webcomment/">WebComment Admin</a></navtrail_previous_links>
+<navbar_select>webcomment-admin-guide</navbar_select>
 
 FIXME
diff --git a/modules/webcomment/doc/admin/index.html.wml b/modules/webcomment/doc/admin/index.html.wml
index aecf9889f..de0320ea9 100644
--- a/modules/webcomment/doc/admin/index.html.wml
+++ b/modules/webcomment/doc/admin/index.html.wml
@@ -1,33 +1,32 @@
 ## $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.
 ##
 ## 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.
 
-#include "cdspage.wml" \
-    title="WebComment Admin" \
-    navtrail_previous_links="<a class=navtrail href=<WEBURL>/admin/<lang:star: index.*.html>>_(Admin Area)_</a>" \
-    navbar_name="admin" \
-    navbar_select="webcomment" 
-     
+<title>WebComment Admin</title>
+<navbar_name>admin</navbar_name>
+<navtrail_previous_links><a class="navtrail" href="<WEBURL>/admin/<lang:star: index.*.html>">_(Admin Area)_</a></navtrail_previous_links>
+<navbar_select>webcomment</navbar_select>
+
 <dl>
  <dt><a href="webcommentadmin.py">WebComment Admin Interface</a></dt>
  <dd>Start area for WebComment administration.</dd>
 </dl>
 <dl>
  <dt><a href="guide.html">WebComment Admin Guide</a></dt>
  <dd>Everything you want to know about WebComment administration</dd>
 </dl>
diff --git a/modules/webcomment/doc/admin/guide.html.wml b/modules/webcomment/doc/admin/webcomment-admin-guide.webdoc
similarity index 71%
copy from modules/webcomment/doc/admin/guide.html.wml
copy to modules/webcomment/doc/admin/webcomment-admin-guide.webdoc
index 2d8568c28..c14822d63 100644
--- a/modules/webcomment/doc/admin/guide.html.wml
+++ b/modules/webcomment/doc/admin/webcomment-admin-guide.webdoc
@@ -1,27 +1,26 @@
 ## -*- mode: html; coding: utf-8; -*-
 ## $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.
 ##
 ## 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.
 
-#include "cdspage.wml" \
-    title="WebComment Admin Guide" \
-    navtrail_previous_links="<a class=navtrail href=<WEBURL>/admin/<lang:star: index.*.html>>_(Admin Area)_</a> &gt; <a class=navtrail href=<WEBURL>/admin/webcomment/>WebComment Admin</a>" \
-    navbar_name="admin" \
-    navbar_select="webcomment-admin-guide"
+<!-- WebDoc-Page-Title: WebComment 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="webcomment-admin">WebComment Admin</a> -->
+<!-- WebDoc-Page-Navbar-Select: webcomment-admin-guide -->
 
 FIXME
diff --git a/modules/webcomment/doc/admin/index.html.wml b/modules/webcomment/doc/admin/webcomment-admin.webdoc
similarity index 70%
copy from modules/webcomment/doc/admin/index.html.wml
copy to modules/webcomment/doc/admin/webcomment-admin.webdoc
index aecf9889f..5e3b6384a 100644
--- a/modules/webcomment/doc/admin/index.html.wml
+++ b/modules/webcomment/doc/admin/webcomment-admin.webdoc
@@ -1,33 +1,32 @@
 ## $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.
 ##
 ## 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.
 
-#include "cdspage.wml" \
-    title="WebComment Admin" \
-    navtrail_previous_links="<a class=navtrail href=<WEBURL>/admin/<lang:star: index.*.html>>_(Admin Area)_</a>" \
-    navbar_name="admin" \
-    navbar_select="webcomment" 
-     
+<!-- WebDoc-Page-Title: WebComment 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: webcomment -->
+
 <dl>
- <dt><a href="webcommentadmin.py">WebComment Admin Interface</a></dt>
+ <dt><a href="<WEBURL>/admin/webcomment/webcommentadmin.py">WebComment Admin Interface</a></dt>
  <dd>Start area for WebComment administration.</dd>
 </dl>
 <dl>
- <dt><a href="guide.html">WebComment Admin Guide</a></dt>
+ <dt><a href="webcomment-admin-guide">WebComment Admin Guide</a></dt>
  <dd>Everything you want to know about WebComment administration</dd>
 </dl>