diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7448181ae..f66d2b390 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,10 +3,13 @@ project(POLARSSL C)
 
 enable_testing()
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -Wall -W -Wdeclaration-after-statement -fprofile-arcs -ftest-coverage -lgcov")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wdeclaration-after-statement")
+set(CMAKE_C_FLAGS_DEBUG "-g -O0")
+set(CMAKE_C_FLAGS_COVERAGE "-g -O0 -fprofile-arcs -ftest-coverage -lgcov")
+
+if(CMAKE_BUILD_TYPE STREQUAL "Coverage")
 set(CMAKE_SHARED_LINKER_FLAGS "-fprofile-arcs -ftest-coverage")
-#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -Wall -W")
-#set(CMAKE_SHARED_LINKER_FLAGS "")
+endif(CMAKE_BUILD_TYPE STREQUAL "Coverage")
 
 include_directories(include/)
 
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 51c45fc72..c545d56e3 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -1,15 +1,27 @@
 add_library(polarssl STATIC
-     base64.c rsa.c timing.c havege.c
-     md5.c
-     ssl_cli.c 
-     bignum.c    debug.c              sha1.c  x509parse.c
-     aes.c        net.c      ssl_srv.c 
-     camellia.c  des.c                md2.c             sha2.c   xtea.c
+     aes.c
      arc4.c
-     padlock.c
-     ssl_tls.c
+     base64.c
+     bignum.c
+     camellia.c
      certs.c
+     debug.c
+     des.c
      dhm.c
+     havege.c
+     md2.c
      md4.c
+     md5.c
+     net.c
+     padlock.c
+     rsa.c
+     sha1.c
+     sha2.c
      sha4.c
+     ssl_cli.c 
+     ssl_srv.c 
+     ssl_tls.c
+     timing.c
+     x509parse.c
+     xtea.c
 )