diff --git a/src/arduino-base.cmake b/src/arduino-base.cmake
index c3cdf33..6e4eb47 100644
--- a/src/arduino-base.cmake
+++ b/src/arduino-base.cmake
@@ -1,5 +1,5 @@
 set(ARDUINO_BASE_LIBDIR /opt/arduino-1.8.5)
-set(ARDUINO_SAMD_DIR $ENV{HOME}/.arduino15/packages/arduino/hardware/samd/1.6.16)
+set(ARDUINO_SAMD_DIR $ENV{HOME}/.arduino15/packages/arduino/hardware/samd/1.6.17)
 
 set(ARDUINO_INCLUDE_DIRS
     ${ARDUINO_SAMD_DIR}/cores/arduino
diff --git a/src/shared.cmake b/src/shared.cmake
index c20d3fd..b747314 100644
--- a/src/shared.cmake
+++ b/src/shared.cmake
@@ -11,16 +11,16 @@ if(DTLS)
     set(SHARED_SOURCES
 	    ${SHARED_SOURCES}
 		${TINYDTLS_SOURCES}
-		${SHARED_SOURCES_DIR}/dtlsconnection.c)
-    
+		${SHARED_SOURCES_DIR}/dtlsconnection.cpp)
+
 	set(SHARED_INCLUDE_DIRS
-		${SHARED_SOURCES_DIR} 
+		${SHARED_SOURCES_DIR}
 		${TINYDTLS_SOURCES_DIR})
-    
+
 	set(SHARED_DEFINITIONS -DWITH_TINYDTLS)
 else()
     set(SHARED_SOURCES
-		${SHARED_SOURCES} 
+		${SHARED_SOURCES}
 		${SHARED_SOURCES_DIR}/connection.cpp)
 
     set(SHARED_INCLUDE_DIRS ${SHARED_SOURCES_DIR})