diff --git a/daemon/doc/doxygen/core-doc.cfg.in b/daemon/doc/doxygen/core-doc.cfg.in
index c1f5af28754311627e9a56029e3f2328baaeaa1a..39c7185923c3de1635b203ec3afe0cdb88cbe7e9 100644
--- a/daemon/doc/doxygen/core-doc.cfg.in
+++ b/daemon/doc/doxygen/core-doc.cfg.in
@@ -51,7 +51,7 @@ PROJECT_LOGO           =
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       =	./generated-doc
+OUTPUT_DIRECTORY       =
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
diff --git a/hudson-sflphone-script.sh b/hudson-sflphone-script.sh
index 0579ccd6415f6c1be8d23a829c779d3e9f58ee55..e7873e20b68581e2f52688807930f8d04c66b58b 100755
--- a/hudson-sflphone-script.sh
+++ b/hudson-sflphone-script.sh
@@ -20,7 +20,9 @@ function run_code_analysis {
 function gen_doxygen {
 	# Check if doxygen is installed on the system
 	if [ `which doxygen &>/dev/null ; echo $?` -ne 1 ] ; then
+		pushd doc/doxygen
 		doxygen core-doc.cfg.in
+		popd
 	fi
 }