diff --git a/src/knx/bits.h b/src/knx/bits.h
index 1cd94bf..1d29279 100644
--- a/src/knx/bits.h
+++ b/src/knx/bits.h
@@ -98,4 +98,12 @@ enum ParameterFloatEncodings
     Float_Enc_DPT9 = 0,          // 2 Byte. See Chapter 3.7.2 section 3.10 (Datapoint Types 2-Octet Float Value)
     Float_Enc_IEEE754Single = 1, // 4 Byte. C++ float
     Float_Enc_IEEE754Double = 2, // 8 Byte. C++ double
-};
\ No newline at end of file
+};
+
+
+#if defined(ARDUINO_ARCH_SAMD)
+// temporary undef until framework-arduino-samd > 1.8.9 is released. See https://github.com/arduino/ArduinoCore-samd/pull/399 for a PR should will probably address this
+#undef max
+#undef min
+// end of temporary undef
+#endif
\ No newline at end of file
diff --git a/src/knx/group_object.h b/src/knx/group_object.h
index 3578c39..7fdf5e6 100644
--- a/src/knx/group_object.h
+++ b/src/knx/group_object.h
@@ -20,7 +20,7 @@ enum ComFlag
 class GroupObject;
 
 #ifndef HAS_FUNCTIONAL
-# if defined(__linux__) || defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_STM32)
+# if defined(__linux__) || defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_STM32) || defined (ARDUINO_ARCH_SAMD)
 #  define HAS_FUNCTIONAL    1
 # else
 #  define HAS_FUNCTIONAL   0