diff --git a/cmake_modules/GenPkgConfig.cmake b/cmake_modules/GenPkgConfig.cmake
index f847114bd1d62b1e416fe94ea8dd275cea8b858b..cde9c695498f346e1146395ee59af3cb44124eee 100644
--- a/cmake_modules/GenPkgConfig.cmake
+++ b/cmake_modules/GenPkgConfig.cmake
@@ -95,13 +95,18 @@ MACRO(GENERATE_PKGCONFIG_FILE _file)
     set(CHAMELEON_PKGCONFIG_LIBS_CPY "${CHAMELEON_PKGCONFIG_LIBS}")
     set(CHAMELEON_PKGCONFIG_LIBS "")
     foreach(_dep ${CHAMELEON_PKGCONFIG_LIBS_CPY})
-        get_filename_component(dep_we ${_dep} NAME)
-        STRING(REPLACE "lib"    "-l" dep_we "${dep_we}")
-        STRING(REPLACE ".so"    ""   dep_we "${dep_we}")
-        STRING(REPLACE ".a"     ""   dep_we "${dep_we}")
-        STRING(REPLACE ".dylib" ""   dep_we "${dep_we}")
-        STRING(REPLACE ".dll"   ""   dep_we "${dep_we}")
-        list(APPEND CHAMELEON_PKGCONFIG_LIBS ${dep_we})
+        if (NOT ${_dep} MATCHES "^-L")
+            get_filename_component(dep_we ${_dep} NAME)
+            message(STATUS "dep_we : ${dep_we}")
+            STRING(REPLACE "lib"    "-l" dep_we "${dep_we}")
+            STRING(REPLACE ".so"    ""   dep_we "${dep_we}")
+            STRING(REPLACE ".a"     ""   dep_we "${dep_we}")
+            STRING(REPLACE ".dylib" ""   dep_we "${dep_we}")
+            STRING(REPLACE ".dll"   ""   dep_we "${dep_we}")
+            list(APPEND CHAMELEON_PKGCONFIG_LIBS ${dep_we})
+        else()
+            list(APPEND CHAMELEON_PKGCONFIG_LIBS ${_dep})
+        endif()
     endforeach()
 
     list(REMOVE_DUPLICATES CHAMELEON_PKGCONFIG_LIBS)
diff --git a/lib/pkgconfig/chameleon-quark.pc.in b/lib/pkgconfig/chameleon-quark.pc.in
index c53513b1a2f50ea607b58da27014ee6a22fdfd4f..36b42ec79a72920372d52086543e6c3b86d9ecd7 100644
--- a/lib/pkgconfig/chameleon-quark.pc.in
+++ b/lib/pkgconfig/chameleon-quark.pc.in
@@ -6,7 +6,7 @@ includedir=${exec_prefix}/include/chameleon
 Name: chameleon
 Description: Dense Linear Algebra for Scalable Multi-core Architectures and GPGPUs
 Version: @CHAMELEON_VERSION_MAJOR@.@CHAMELEON_VERSION_MINOR@.@CHAMELEON_VERSION_PATCH@
-Cflags: -I${includedir}
+Cflags: -I${includedir} -I${includedir}/coreblas/include
 Libs: -L${libdir} @CHAMELEON_PKGCONFIG_LIBS@
 Libs.private: @CHAMELEON_PKGCONFIG_LIBS_PRIVATE@
 Requires: @CHAMELEON_PKGCONFIG_REQUIRED@
diff --git a/lib/pkgconfig/chameleon-starpu.pc.in b/lib/pkgconfig/chameleon-starpu.pc.in
index c53513b1a2f50ea607b58da27014ee6a22fdfd4f..36b42ec79a72920372d52086543e6c3b86d9ecd7 100644
--- a/lib/pkgconfig/chameleon-starpu.pc.in
+++ b/lib/pkgconfig/chameleon-starpu.pc.in
@@ -6,7 +6,7 @@ includedir=${exec_prefix}/include/chameleon
 Name: chameleon
 Description: Dense Linear Algebra for Scalable Multi-core Architectures and GPGPUs
 Version: @CHAMELEON_VERSION_MAJOR@.@CHAMELEON_VERSION_MINOR@.@CHAMELEON_VERSION_PATCH@
-Cflags: -I${includedir}
+Cflags: -I${includedir} -I${includedir}/coreblas/include
 Libs: -L${libdir} @CHAMELEON_PKGCONFIG_LIBS@
 Libs.private: @CHAMELEON_PKGCONFIG_LIBS_PRIVATE@
 Requires: @CHAMELEON_PKGCONFIG_REQUIRED@