diff --git a/Changelog b/Changelog
index c057ae83..8ae480ae 100644
--- a/Changelog
+++ b/Changelog
@@ -9,6 +9,8 @@
    - fixed some broken tests
   * BUGFIXES:
    - #142 - duplication of custom services
+   - #136 - sphinx-apidoc command not found
+   - #137 - make command fails when using distclean
 
 2017-09-01 CORE 5.0
   * DEVELOPMENT:
diff --git a/Makefile.am b/Makefile.am
index 438db6f6..271a6c13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@
 #
 
 if WANT_DOCS
-  DOCS			= doc daemon/doc
+  DOCS			= doc
 endif
 if WANT_GUI
   GUI			= gui
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 42f7dcc7..6c21e6d6 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -10,6 +10,10 @@
 SETUPPY		= setup.py
 SETUPPYFLAGS	= -v
 
+if WANT_DOCS
+  SUBDIRS = doc
+endif
+
 SBIN_FILES		=			\
 	sbin/core-cleanup			\
 	sbin/core-daemon			\
@@ -121,8 +125,7 @@ rpm:
 dist-hook:
 	rm -rf `find $(distdir)/ -name .svn` `find $(distdir)/ -name '*.pyc'`
 
-DISTCLEANFILES	= Makefile.in core/*.pyc MANIFEST doc/Makefile.in doc/Makefile \
-		  doc/conf.py 
+DISTCLEANFILES	= Makefile.in core/*.pyc MANIFEST 
 
 # files to include with distribution tarball
 EXTRA_DIST	= $(SETUPPY) MANIFEST.in core doc $(LOGROTATE_FILE)
diff --git a/daemon/doc/Makefile.am b/daemon/doc/Makefile.am
index ca3b5664..dd2d0bb8 100644
--- a/daemon/doc/Makefile.am
+++ b/daemon/doc/Makefile.am
@@ -8,7 +8,7 @@
 #
 
 # extra cruft to remove
-DISTCLEANFILES	= conf.py Makefile.in stamp-vti *.rst
+DISTCLEANFILES	= conf.py Makefile Makefile.in stamp-vti *.rst
 
 all:	index.rst
 
diff --git a/sonar-project.properties b/sonar-project.properties
index d579815b..46f00a5e 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,10 +1,10 @@
 # branch name for the sonar analysis
-sonar.branch=origin/cleanup
+sonar.branch=origin/master
 
 # required metadata
 sonar.projectKey=CORE
 sonar.projectName=CORE
-sonar.projectVersion=1.0.0
+sonar.projectVersion=5.1
 
 # define modules
 sonar.modules=PythonLibrary