diff --git a/CASA/Makefile.am b/CASA/Makefile.am
index ceff84ee..153aad0f 100644
--- a/CASA/Makefile.am
+++ b/CASA/Makefile.am
@@ -39,8 +39,9 @@ DIST_SUBDIRS = micasacache common micasadk jwrapper  package
 endif
 
 EXTRA_DIST = include include/*.h \
-	     doc/*txt doc/*.pdf \
-	     Readme*.txt autogen.sh 
+	     doc/internal/*.doc doc/internal/*.xsd \
+             doc/product/*.pdf doc/product/*.txt \
+	     readme-folder/readme*  autogen.sh 
 
 CASALIBDIR = $(LIB)
 
diff --git a/CASA/doc/internal/CCF V3.xsd b/CASA/doc/internal/CCF_V3.xsd
similarity index 100%
rename from CASA/doc/internal/CCF V3.xsd
rename to CASA/doc/internal/CCF_V3.xsd
diff --git a/CASA/doc/internal/SecretStore client service.doc b/CASA/doc/internal/SecretStore_client_service.doc
similarity index 100%
rename from CASA/doc/internal/SecretStore client service.doc
rename to CASA/doc/internal/SecretStore_client_service.doc