diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe12e9f83f9a7178434ce5c772b017ce179f97a3..88af35c7f8e7c2a5ee97dd3e40b8dd69c2cabb16 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1069,6 +1069,9 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/cmake_modules/")
 
     if(CHAMELEON_ENABLE_DOCS)
         add_subdirectory(docs)
+        if (DOXYGEN_EXECUTABLE AND MAKEINFO_COMPILER AND TEXI2DVI_COMPILER AND TEX_COMPILER)
+            add_custom_target(docs ALL DEPENDS doxygen-out doc-info-users_guide doc-html-users_guide doc-pdf-users_guide)
+        endif()
     endif()
     #------------------------------------------------------------------------------
 
@@ -1090,6 +1093,15 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/cmake_modules/")
     endif()
     #------------------------------------------------------------------------------
 
+    ###############################################################################
+    # Release source #
+    ##################
+    set(CPACK_SOURCE_GENERATOR "TGZ")
+    set(CPACK_PACKAGE_NAME "chameleon")
+    set(CPACK_PACKAGE_VERSION "${CHAMELEON_VERSION_MAJOR}.${CHAMELEON_VERSION_MINOR}.${CHAMELEON_VERSION_MICRO}")
+    set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
+    set(CPACK_SOURCE_IGNORE_FILES "build;.cproject;.dir-locals.el;.project;.pydevproject;.svn")
+    include(CPack)
 
     ###############################################################################
     # Print Options #
diff --git a/testing/CTestLists.cmake b/testing/CTestLists.cmake
index 854bfc8c8f0ab8a9278e678136546fddb8a17760..e4d5396ce1b5c616816c5373d3273ff06addb2fa 100644
--- a/testing/CTestLists.cmake
+++ b/testing/CTestLists.cmake
@@ -26,7 +26,7 @@ foreach(cat  ${TEST_CATEGORIES})
         add_test(test_${cat}_${prec}syrk  ./${prec}${TEST_CMD_${cat}} SYRK  1.0 -2.0 600 500 650 625)
         add_test(test_${cat}_${prec}syr2k ./${prec}${TEST_CMD_${cat}} SYR2K 1.0 -2.0 600 500 650 625 700)
 
-        if ( "${prec}" STREQUAL "c" OR "${prec}" STREQUAL "z" )
+        if ( prec STREQUAL "c" OR prec STREQUAL "z" )
           add_test(test_${cat}_${prec}hemm  ./${prec}${TEST_CMD_${cat}} HEMM      1.0 -2.0 600 500 650 625 600)
           add_test(test_${cat}_${prec}herk  ./${prec}${TEST_CMD_${cat}} HERK      1.0 -2.0 600 500 650 625)
           add_test(test_${cat}_${prec}her2k ./${prec}${TEST_CMD_${cat}} HER2K     1.0 -2.0 600 500 650 625 700)