diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5d51cf..c5989d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,7 +105,7 @@ endif ($ENV{BUILD_TESTS})
 # Target for documentation (make doc)
 find_program(Doxygen NAMES doxygen)
 if (EXISTS ${Doxygen})
-    add_custom_target(doc COMMAND ${Doxygen} doc/doxygen-impldoc.conf COMMAND ${Doxygen} doc/doxygen-userdoc.conf)
+    add_custom_target(doc COMMAND cd doc && ${Doxygen} doxygen-impldoc.conf COMMAND cd doc && ${Doxygen} doxygen-userdoc.conf COMMAND cd doc && ${Doxygen} doxygen-mdeclarativecache.conf)
 else (EXISTS ${Doxygen})
     message(STATUS "Doxygen not found: you're not able to build documentation.")
 endif (EXISTS ${Doxygen})
@@ -116,6 +116,7 @@ install(FILES README DESTINATION /usr/share/doc/applauncherd)
 # Install html documentation
 install(DIRECTORY doc/implementation-documentation DESTINATION /usr/share/doc/applauncherd OPTIONAL)
 install(DIRECTORY doc/user-documentation DESTINATION /usr/share/doc/applauncherd OPTIONAL)
+install(DIRECTORY doc/mdeclarativecache-documentation DESTINATION /usr/share/doc/applauncherd OPTIONAL)
 
 
 # Install examples
diff --git a/debian/api b/debian/api
index 3f117e5..d2de6a7 100644
--- a/debian/api
+++ b/debian/api
@@ -3,7 +3,7 @@ type: library
 scope: Nokia MeeGo
 state: unstable
 doc-type: doxygen
-doxygen-conf: doc/doxygen-userdoc.conf
+doxygen-conf: doc/doxygen-mdeclarativecache.conf
 libs-pkg: applauncherd-launcher
 dev-pkg: applauncherd-dev
 headers: /usr/include/applauncherd/mdeclarativecache.h
diff --git a/debian/changelog b/debian/changelog
index e9ec957..1cffa1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,11 @@ applauncherd (0.29.0) unstable; urgency=low
   * Changes: New test added to check the daemons running after boot that uses invoker
   * Changes: More Coverity tool defect fixes
   * Changes: Exec Booster documentation added
-
+  * Changes: Created a separate documentationpage config for MDeclarativeCache interface
+  * Changes: Changed relative paths to start from righ level in doxygen conf files
+  * Fixes: NB#238947 - The API documentation main page for QML Booster needs to be updated
+  * Fixes: NB#249220 - Applauncherd doxygen INPUT/OUTPUT paths should be relative	
+	
  -- Nimika Keshri <nimika.1.keshri@nokia.com>  Tue, 19 Apr 2011 10:43:29 +0300
 
 applauncherd (0.28.0) stable; urgency=low
diff --git a/doc/doxygen-impldoc.conf b/doc/doxygen-impldoc.conf
index 54dda51..5ab9381 100644
--- a/doc/doxygen-impldoc.conf
+++ b/doc/doxygen-impldoc.conf
@@ -38,7 +38,7 @@ PROJECT_NUMBER         =
 # 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       = 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 
@@ -564,7 +564,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = src/invoker src/launcher
+INPUT                  = ../src/invoker ../src/launcher
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
diff --git a/doc/doxygen-userdoc.conf b/doc/doxygen-userdoc.conf
index 6baa5bf..c68e057 100644
--- a/doc/doxygen-userdoc.conf
+++ b/doc/doxygen-userdoc.conf
@@ -38,7 +38,7 @@ PROJECT_NUMBER         =
 # 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       = doc/user-documentation
+OUTPUT_DIRECTORY       = user-documentation
 
 # 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 
@@ -564,22 +564,22 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = doc/mainpage.dox \ 
-                         doc/qmlboost.dox \
-                         doc/libmeegotouchboost.dox \
-                         doc/qtboost.dox \
-                         doc/eboost.dox \
-                         doc/aegis.dox \
-                         doc/howdoesitwork.dox \
-                         doc/technical.dox \
-                         doc/debug.dox \
-                         doc/limitations.dox \
-                         doc/invokerparameters.dox \
-                         doc/singleinstance.dox \
-                         doc/splash.dox \
-                         doc/dbus.dox \
-                         doc/customboosters.dox \
-                         src/qdeclarativebooster/mdeclarativecache.h
+INPUT                  = mainpage.dox \ 
+                         qmlboost.dox \
+                         libmeegotouchboost.dox \
+                         qtboost.dox \
+                         eboost.dox \
+                         aegis.dox \
+                         howdoesitwork.dox \
+                         technical.dox \
+                         debug.dox \
+                         limitations.dox \
+                         invokerparameters.dox \
+                         singleinstance.dox \
+                         splash.dox \
+                         dbus.dox \
+                         customboosters.dox \
+                         ../src/qdeclarativebooster/mdeclarativecache.h
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is