diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8163635..b1face4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,10 +58,10 @@ IF(NOT DEFINED SHARE_INSTALL_PREFIX)
 ENDIF(NOT DEFINED SHARE_INSTALL_PREFIX)
 
 # Additonnal GCC flags
-IF(CMAKE_COMPILER_IS_GNU_CC)
+IF(CMAKE_COMPILER_IS_GNUCC)
   # Make sure we will not miss some warnings ;)
   ADD_DEFINITIONS(-Wall -pedantic -std=c99)
-ENDIF(CMAKE_COMPILER_IS_GNU_CC)
+ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
 # Workarounds for libusb in C99
 ADD_DEFINITIONS(-Du_int8_t=uint8_t -Du_int16_t=uint16_t)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index e3d3f77..6433c2a 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(EXAMPLES-SOURCES nfc-list nfc-mfclassic nfc-mfultralight nfcip-initiator nfcip-target nfc-anticol nfc-emulate nfc-relay nfc-sam)
+SET(EXAMPLES-SOURCES nfc-anticol nfc-dep-initiator nfc-dep-target nfc-emulate-forum-tag4 nfc-emulate-tag nfc-emulate-uid nfc-list nfc-mfclassic nfc-mfultralight nfc-poll nfc-relay nfc-relay-picc pn53x-diagnose pn53x-sam pn53x-tamashell)
 
 # XXX: Examples should not use private API!
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libnfc)