diff --git a/configure.ac b/configure.ac
index d8ef0003b..bef9adbe2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -370,6 +370,8 @@ AC_OUTPUT([ \
   ./doc/Makefile \
   ./doc/salome/Makefile \
   ./doc/salome/gui/Makefile \
+  ./doc/salome/gui/GEOM/doxyfile \
+  ./doc/salome/gui/GEOM/doxyfile_py \
   ./doc/salome/tui/Makefile \
   ./doc/salome/tui/GEOM/doxyfile \
   ./doc/salome/tui/GEOM/sources/static/tree.js \
diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am
index 404cc5805..2ab31da21 100644
--- a/doc/salome/gui/Makefile.am
+++ b/doc/salome/gui/Makefile.am
@@ -25,9 +25,14 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 EXTRA_DIST+=GEOM
 
+doxygen=@DOXYGEN@
+
 usr_docs:
-	cp -fr $(srcdir)/GEOM ./
-	-find $(PWD) -name CVS -prune -exec rm -rf {} \;
+	cd ./GEOM; \
+	echo "Processing geompyDC.py file: "; \
+	$(doxygen) ./doxyfile_py; \
+	echo "Running doxygen in directory: "`pwd`; \
+	$(doxygen) ./doxyfile;
 
 docs: usr_docs
 
@@ -42,3 +47,10 @@ install-data-local: usr_docs
 
 uninstall-local:
 	rm -rf $(docdir)/gui/GEOM
+
+docguidir=$(docdir)/gui/GEOM
+
+nodist_docgui_DATA= GEOM/doxyfile
+nodist_docgui_DATA+= GEOM/doxyfile_py
+EXTRA_DIST+= GEOM/doxyfile.in
+EXTRA_DIST+= GEOM/doxyfile_py.in
\ No newline at end of file