diff --git a/configure.in b/configure.in
index 66a4766..de2265d 100644
--- a/configure.in
+++ b/configure.in
@@ -73,6 +73,9 @@ AC_OUTPUT([
 makefile
 dia/makefile
 doc/makefile
+doc/en/makefile
+doc/en/Dia/makefile
+doc/en/DiaSharp/makefile
 glue/makefile
 sample/makefile
 sample/pixmaps/makefile
diff --git a/dia/makefile.am b/dia/makefile.am
index baa2bfd..452463f 100644
--- a/dia/makefile.am
+++ b/dia/makefile.am
@@ -41,7 +41,3 @@ clean:
 	rm -f $(LIBRARY)
 	rm -rf generated
 	rm -f generated-stamp
-
-distclean:
-	rm -r CVS
-	rm .cvsignore
diff --git a/doc/diacanvas-docs.tree b/doc/diacanvas-docs.tree
index 3a439cf..155d60d 100644
Binary files a/doc/diacanvas-docs.tree and b/doc/diacanvas-docs.tree differ
diff --git a/doc/diacanvas-docs.zip b/doc/diacanvas-docs.zip
index 711f7ee..72240db 100644
Binary files a/doc/diacanvas-docs.zip and b/doc/diacanvas-docs.zip differ
diff --git a/doc/makefile.am b/doc/makefile.am
index b1b58e6..0835393 100644
--- a/doc/makefile.am
+++ b/doc/makefile.am
@@ -1,7 +1,8 @@
+SUBDIRS=en
 diacanvasdocdir=$(MONODOC_SOURCESDIR)
 diacanvasdoc_DATA = diacanvas-docs.zip diacanvas-docs.tree diacanvas-docs.source
 CLEANFILES= *.tree *.zip tmp ..zip
-EXTRA_DIST= makefile.am makefile.in
+EXTRA_DIST= diacanvas-docs.source diacanvas-docs.tree diacanvas-docs.zip
 
 ASSEMBLER=../../monodoc/browser/assembler.exe
 UPDATER=../../monodoc/generator/updater.exe
@@ -13,16 +14,3 @@ diacanvas-docs.zip diacanvas-docs.tree: en/*/*.xml
 
 update:
 	mono $(UPDATER) ../dia/diacanvas-sharp.dll -o ./en -f
-
-clean:
-	rm -f *.tree
-	rm -f *.zip
-	rm -f tmp
-	rm -f ..zip
-
-distclean:
-	rm -r CVS
-	rm -r en/CVS
-	rm -r en/Dia/CVS
-	rm -r en/DiaSharp/CVS
-	rm .cvsignore
diff --git a/glue/makefile.am b/glue/makefile.am
index df0a07a..5d717c8 100644
--- a/glue/makefile.am
+++ b/glue/makefile.am
@@ -10,4 +10,3 @@ libdiacanvassharpglue_la_SOURCES = \
 
 libdiacanvassharpglue_la_LIBADD = $(DIACANVAS2_LIBS)
 INCLUDES = $(DIACANVAS2_CFLAGS)
- 
diff --git a/sample/makefile.am b/sample/makefile.am
index 7063ec2..4cb7891 100644
--- a/sample/makefile.am
+++ b/sample/makefile.am
@@ -33,9 +33,3 @@ install:
 
 clean:
 	rm -f $(SAMPLE)
-
-distclean:
-	rm -r CVS
-	rm -r glade/CVS
-	rm -r pixmaps/CVS
-	rm .cvsignore
diff --git a/sources/makefile.am b/sources/makefile.am
index 319793d..833d0ef 100644
--- a/sources/makefile.am
+++ b/sources/makefile.am
@@ -11,8 +11,3 @@ get-source-code:
 
 #export CVS_PASSWORD=""
 #cvs -z3 -d:pserver:anonymous@cvs.sf.net:/cvsroot/diacanvas co $(PACKAGE)
-
-distclean:
-	rm -rf $(PACKAGE)
-	rm -r CVS
-	rm -r .cvsignore