diff --git a/modules/bibindex/doc/admin/Makefile.am b/modules/bibindex/doc/admin/Makefile.am
index b64311ad6..fee622777 100644
--- a/modules/bibindex/doc/admin/Makefile.am
+++ b/modules/bibindex/doc/admin/Makefile.am
@@ -1,30 +1,30 @@
 ## $Id$
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002, 2003, 2004, 2005 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 docdir = $(WEBDIR)/admin/bibindex
 
-doc_DATA=guide.html
+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
diff --git a/modules/bibindex/web/admin/index.html.wml b/modules/bibindex/doc/admin/index.html.wml
similarity index 100%
rename from modules/bibindex/web/admin/index.html.wml
rename to modules/bibindex/doc/admin/index.html.wml
diff --git a/modules/bibindex/web/admin/Makefile.am b/modules/bibindex/web/admin/Makefile.am
index c4df943ee..642847bc9 100644
--- a/modules/bibindex/web/admin/Makefile.am
+++ b/modules/bibindex/web/admin/Makefile.am
@@ -1,30 +1,26 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002, 2003, 2004, 2005 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 webappdir = $(WEBDIR)/admin/bibindex
 
-webapp_DATA= index.html bibindexadmin.py
+webapp_DATA = bibindexadmin.py
 
-EXTRA_DIST = index.html.wml bibindexadmin.py
+EXTRA_DIST = bibindexadmin.py
 
-CLEANFILES = index.html *~ *.tmp
-
-%.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
-	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
-	$(PYTHON) $(top_srcdir)/po/i18n_update_wml_target.py en $@
\ No newline at end of file
+CLEANFILES = *~ *.tmp
\ No newline at end of file
diff --git a/modules/bibrank/doc/admin/Makefile.am b/modules/bibrank/doc/admin/Makefile.am
index 38f94744e..e7373b1d9 100644
--- a/modules/bibrank/doc/admin/Makefile.am
+++ b/modules/bibrank/doc/admin/Makefile.am
@@ -1,31 +1,31 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002, 2003, 2004, 2005 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 docdir = $(WEBDIR)/admin/bibrank
 
-doc_DATA = guide.html
+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
diff --git a/modules/bibrank/web/admin/index.html.wml b/modules/bibrank/doc/admin/index.html.wml
similarity index 100%
rename from modules/bibrank/web/admin/index.html.wml
rename to modules/bibrank/doc/admin/index.html.wml
diff --git a/modules/bibrank/web/admin/Makefile.am b/modules/bibrank/web/admin/Makefile.am
index 8aa43fc68..30787bdc6 100644
--- a/modules/bibrank/web/admin/Makefile.am
+++ b/modules/bibrank/web/admin/Makefile.am
@@ -1,30 +1,26 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002, 2003, 2004, 2005 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 webappdir = $(WEBDIR)/admin/bibrank
 
-webapp_DATA = bibrankadmin.py index.html
+webapp_DATA = bibrankadmin.py
 
-EXTRA_DIST = bibrankadmin.py index.html.wml
+EXTRA_DIST = bibrankadmin.py
 
-CLEANFILES = index.html *~ *.tmp
-
-%.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
-	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
-	$(PYTHON) $(top_srcdir)/po/i18n_update_wml_target.py en $@
\ No newline at end of file
+CLEANFILES = *~ *.tmp
\ No newline at end of file
diff --git a/modules/webaccess/doc/admin/Makefile.am b/modules/webaccess/doc/admin/Makefile.am
index 20354c3d8..ac6ba5351 100644
--- a/modules/webaccess/doc/admin/Makefile.am
+++ b/modules/webaccess/doc/admin/Makefile.am
@@ -1,31 +1,31 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002, 2003, 2004, 2005 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 docdir = $(WEBDIR)/admin/webaccess
 
-doc_DATA=guide.html
+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
diff --git a/modules/webaccess/web/admin/index.html.wml b/modules/webaccess/doc/admin/index.html.wml
similarity index 100%
rename from modules/webaccess/web/admin/index.html.wml
rename to modules/webaccess/doc/admin/index.html.wml
diff --git a/modules/webaccess/web/admin/Makefile.am b/modules/webaccess/web/admin/Makefile.am
index 77ca40da9..d36ce190f 100644
--- a/modules/webaccess/web/admin/Makefile.am
+++ b/modules/webaccess/web/admin/Makefile.am
@@ -1,30 +1,26 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002, 2003, 2004, 2005 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 webappdir = $(WEBDIR)/admin/webaccess
 
-webapp_DATA = webaccessadmin.py index.html
+webapp_DATA = webaccessadmin.py
 
-EXTRA_DIST = webaccessadmin.py index.html.wml
+EXTRA_DIST = webaccessadmin.py
 
-CLEANFILES = index.html *~ *.tmp
-
-%.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
-	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
-	$(PYTHON) $(top_srcdir)/po/i18n_update_wml_target.py en $@
\ No newline at end of file
+CLEANFILES = *~ *.tmp
diff --git a/modules/webcomment/doc/admin/Makefile.am b/modules/webcomment/doc/admin/Makefile.am
index 96a0c0061..2b7f63da4 100644
--- a/modules/webcomment/doc/admin/Makefile.am
+++ b/modules/webcomment/doc/admin/Makefile.am
@@ -1,31 +1,31 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002, 2003, 2004, 2005 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 docdir = $(WEBDIR)/admin/webcomment
 
-doc_DATA = guide.html
+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
diff --git a/modules/webcomment/web/admin/index.html.wml b/modules/webcomment/doc/admin/index.html.wml
similarity index 100%
rename from modules/webcomment/web/admin/index.html.wml
rename to modules/webcomment/doc/admin/index.html.wml
diff --git a/modules/webcomment/web/admin/Makefile.am b/modules/webcomment/web/admin/Makefile.am
index 2778dff78..89406f72a 100644
--- a/modules/webcomment/web/admin/Makefile.am
+++ b/modules/webcomment/web/admin/Makefile.am
@@ -1,30 +1,26 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002, 2003, 2004, 2005 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 webappdir = $(WEBDIR)/admin/webcomment
 
-webapp_DATA = index.html webcommentadmin.py
+webapp_DATA = webcommentadmin.py
 
-EXTRA_DIST = index.html.wml webcommentadmin.py
+EXTRA_DIST = webcommentadmin.py
 
-CLEANFILES = index.html *~ *.tmp 
-
-%.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
-	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
-	$(PYTHON) $(top_srcdir)/po/i18n_update_wml_target.py en $@
\ No newline at end of file
+CLEANFILES = *~ *.tmp 
\ No newline at end of file
diff --git a/modules/websearch/doc/admin/Makefile.am b/modules/websearch/doc/admin/Makefile.am
index 52e932ce0..56412c259 100644
--- a/modules/websearch/doc/admin/Makefile.am
+++ b/modules/websearch/doc/admin/Makefile.am
@@ -1,31 +1,31 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002, 2003, 2004, 2005 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 docdir = $(WEBDIR)/admin/websearch
 
-doc_DATA = guide.html
+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
diff --git a/modules/websearch/web/admin/index.html.wml b/modules/websearch/doc/admin/index.html.wml
similarity index 100%
rename from modules/websearch/web/admin/index.html.wml
rename to modules/websearch/doc/admin/index.html.wml
diff --git a/modules/websearch/web/admin/Makefile.am b/modules/websearch/web/admin/Makefile.am
index 8cdd4e4c9..8e2982278 100644
--- a/modules/websearch/web/admin/Makefile.am
+++ b/modules/websearch/web/admin/Makefile.am
@@ -1,30 +1,26 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002, 2003, 2004, 2005 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 webappdir = $(WEBDIR)/admin/websearch
 
-webapp_DATA = index.html websearchadmin.py
+webapp_DATA = websearchadmin.py
 
-EXTRA_DIST = index.html.wml websearchadmin.py
+EXTRA_DIST = websearchadmin.py
 
-CLEANFILES = index.html *~ *.tmp 
-
-%.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
-	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
-	$(PYTHON) $(top_srcdir)/po/i18n_update_wml_target.py en $@
\ No newline at end of file
+CLEANFILES = *~ *.tmp 
\ No newline at end of file