diff --git a/modules/webjournal/lib/Makefile.am b/modules/webjournal/lib/Makefile.am
index b950dfe46..0fb2e0d15 100644
--- a/modules/webjournal/lib/Makefile.am
+++ b/modules/webjournal/lib/Makefile.am
@@ -1,33 +1,32 @@
 ## $Id$
 
 ## This file is part of CDS Invenio.
 ## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 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.
 
 SUBDIRS = widgets
 
 pylibdir = $(libdir)/python/invenio
+pylib_DATA = webjournal_webinterface.py webjournal_utils.py \
+             webjournal_config.py webjournal.py webjournal_washer.py \
+             webjournal_templates.py
 
 formatdir = $(pylibdir)/bibformat_elements
-
-pylib_DATA = webjournal_webinterface.py webjournal_utils.py webjournal_config.py webjournal.py webjournal_washer.py webjournal_templates.py
 format_DATA = bfe_ObjectLanguage.py
 
-#noinst_DATA = webbasket_migration_kit.py
-
-EXTRA_DIST = $(pylib_DATA) #$(noinst_DATA)
+EXTRA_DIST = $(pylib_DATA) $(format_DATA)
 
 CLEANFILES = *~ *.tmp *.pyc
diff --git a/modules/websubmit/lib/Makefile.am b/modules/websubmit/lib/Makefile.am
index f7d183bad..3bd286960 100644
--- a/modules/websubmit/lib/Makefile.am
+++ b/modules/websubmit/lib/Makefile.am
@@ -1,40 +1,40 @@
 ## $Id$
 
 ## This file is part of CDS Invenio.
 ## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 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.
 
 SUBDIRS = functions
 
 pylibdir = $(libdir)/python/invenio
 
 pylib_DATA = websubmit_config.py websubmit_engine.py file.py	\
              websubmit_dblayer.py \
              websubmit_webinterface.py \
              websubmit_templates.py \
              websubmit_regression_tests.py \
              websubmitadmin_config.py \
              websubmitadmin_dblayer.py \
              websubmitadmin_engine.py \
              websubmitadmin_templates.py \
              websubmitadmin_regression_tests.py \
              bibdocfile.py
 
 noinst_DATA = fulltext_files_migration_kit.py
 
-EXTRA_DIST = $(pylib_DATA)
+EXTRA_DIST = $(pylib_DATA) $(noinst_DATA)
 
 CLEANFILES = *~ *.tmp