diff --git a/Config.h b/Config.h
index aad4e52..f85e225 100644
--- a/Config.h
+++ b/Config.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#define NUKI_HUB_VERSION "8.13"
+#define NUKI_HUB_VERSION "8.14"
 
 #define MQTT_QOS_LEVEL 1
 #define MQTT_CLEAN_SESSIONS false
diff --git a/NukiOpenerWrapper.cpp b/NukiOpenerWrapper.cpp
index 98f5613..cda5e59 100644
--- a/NukiOpenerWrapper.cpp
+++ b/NukiOpenerWrapper.cpp
@@ -333,7 +333,8 @@ void NukiOpenerWrapper::updateConfig()
     readConfig();
     readAdvancedConfig();
     _configRead = true;
-    _hasKeypad = _nukiConfig.hasKeypad > 0;
+    _hasKeypad = _nukiConfig.hasKeypad > 0 || _nukiConfig.hasKeypadV2;
+
     if(_nukiConfigValid)
     {
         _firmwareVersion = std::to_string(_nukiConfig.firmwareVersion[0]) + "." + std::to_string(_nukiConfig.firmwareVersion[1]) + "." + std::to_string(_nukiConfig.firmwareVersion[2]);
diff --git a/NukiWrapper.cpp b/NukiWrapper.cpp
index b81cb16..b057bf1 100644
--- a/NukiWrapper.cpp
+++ b/NukiWrapper.cpp
@@ -331,7 +331,7 @@ void NukiWrapper::updateConfig()
     readConfig();
     readAdvancedConfig();
     _configRead = true;
-    _hasKeypad = _nukiConfig.hasKeypad > 0;
+    _hasKeypad = _nukiConfig.hasKeypad > 0 || _nukiConfig.hasKeypadV2;
     if(_nukiConfigValid)
     {
         _firmwareVersion = std::to_string(_nukiConfig.firmwareVersion[0]) + "." + std::to_string(_nukiConfig.firmwareVersion[1]) + "." + std::to_string(_nukiConfig.firmwareVersion[2]);
diff --git a/README.md b/README.md
index fc55e1f..9033fa4 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,8 @@ NUKI Smart Lock 2.0<br>
 NUKI Smart Lock 3.0<br>
 NUKI Smart Lock 3.0 Pro<br>
 NUKI Opener<br>
-NUKI Keypad 1.0 (2.0 not supported yet due to current [NUKI limitations](https://developer.nuki.io/t/keypad-2-not-setting-has-keypad-flag-in-config-of-nuki-lock/19539))
+NUKI Keypad 1.0<br>
+NUKI Keypad 2.0
 
 As an alternative to Wifi, the following ESP32 modules with wired ethernet are supported (For Wifi any other EP32 should work).<br>
 [M5Stack Atom POE](https://docs.m5stack.com/en/atom/atom_poe)<br>
diff --git a/lib/nuki_ble b/lib/nuki_ble
index 56b7b2b..d32d514 160000
--- a/lib/nuki_ble
+++ b/lib/nuki_ble
@@ -1 +1 @@
-Subproject commit 56b7b2bf50840a21ab7435a3a625a53767d69b17
+Subproject commit d32d514dae7f5016608c4e8dd4230e0a291766c0
diff --git a/webflash/nuki_hub.bin b/webflash/nuki_hub.bin
index ca5c03e..642ba38 100644
Binary files a/webflash/nuki_hub.bin and b/webflash/nuki_hub.bin differ