diff --git a/CHANGELOG.md b/CHANGELOG.md
index c478e25..32ed687 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.7.0 (February 20th, 2024)
+
+### Features
+ - Updated Anjay version, updated configuration files
+
 ## 23.11 (November 21st, 2023)
 
 ### Features
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 939652b..e85e3aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2023 AVSystem <avsystem@avsystem.com>
+# Copyright 2023-2024 AVSystem <avsystem@avsystem.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/Kconfig b/Kconfig
index 909665d..4bf24a1 100644
--- a/Kconfig
+++ b/Kconfig
@@ -1,4 +1,4 @@
-# Copyright 2023 AVSystem <avsystem@avsystem.com>
+# Copyright 2023-2024 AVSystem <avsystem@avsystem.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -338,6 +338,10 @@ config ANJAY_WITHOUT_MODULE_FW_UPDATE_PUSH_MODE
     bool "Disable support for PUSH mode Firmware Update."
     depends on ANJAY_WITH_MODULE_FW_UPDATE
 
+config ANJAY_WITH_MODULE_SW_MGMT
+    bool "Enable sw_mgmt module (implementation of the Software Management object)"
+    default n
+
 config ANJAY_WITH_MODULE_IPSO_OBJECTS
     bool "Enable IPSO objects implementation"
     default y
diff --git a/config/anjay/anjay_config.h b/config/anjay/anjay_config.h
index 951d1fd..507eb38 100644
--- a/config/anjay/anjay_config.h
+++ b/config/anjay/anjay_config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 AVSystem <avsystem@avsystem.com>
+ * Copyright 2023-2024 AVSystem <avsystem@avsystem.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -617,13 +617,28 @@
 #endif // CONFIG_ANJAY_WITHOUT_MODULE_FW_UPDATE_PUSH_MODE
 
 /**
- * Enables ipso_objects module (generic implementation of the following kinds of
- * the basic sensor and three axis sensor IPSO objects).
+ * Enable sw_mgmt module (implementation of the Software Management object).
+ */
+#ifdef CONFIG_ANJAY_WITH_MODULE_SW_MGMT
+#    define ANJAY_WITH_MODULE_SW_MGMT
+#endif // CONFIG_ANJAY_WITH_MODULE_SW_MGMT
+
+/**
+ * Enables ipso_objects module (generic implementation of basic sensor, three
+ * axis sensor and Push Button IPSO objects).
  */
 #ifdef CONFIG_ANJAY_WITH_MODULE_IPSO_OBJECTS
 #    define ANJAY_WITH_MODULE_IPSO_OBJECTS
 #endif // CONFIG_ANJAY_WITH_MODULE_IPSO_OBJECTS
 
+/**
+ * Enables experimental ipso_objects_v2 module (generic implementation of basic
+ * sensor and three axis sensor IPSO objects).
+ */
+#ifdef CONFIG_ANJAY_WITH_MODULE_IPSO_OBJECTS_V2
+#    define ANJAY_WITH_MODULE_IPSO_OBJECTS_V2
+#endif // CONFIG_ANJAY_WITH_MODULE_IPSO_OBJECTS_V2
+
 /**
  * Enable at_sms module (implementation of an SMS driver for AT modem devices).
  *
diff --git a/config/avsystem/coap/avs_coap_config.h b/config/avsystem/coap/avs_coap_config.h
index 52a3c5a..1aa4db8 100644
--- a/config/avsystem/coap/avs_coap_config.h
+++ b/config/avsystem/coap/avs_coap_config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 AVSystem <avsystem@avsystem.com>
+ * Copyright 2023-2024 AVSystem <avsystem@avsystem.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/config/avsystem/commons/avs_commons_config.h b/config/avsystem/commons/avs_commons_config.h
index 8ff89f9..20bd38f 100644
--- a/config/avsystem/commons/avs_commons_config.h
+++ b/config/avsystem/commons/avs_commons_config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 AVSystem <avsystem@avsystem.com>
+ * Copyright 2023-2024 AVSystem <avsystem@avsystem.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/config/avsystem/commons/lwip-posix-compat.h b/config/avsystem/commons/lwip-posix-compat.h
index d839267..7a33bb6 100644
--- a/config/avsystem/commons/lwip-posix-compat.h
+++ b/config/avsystem/commons/lwip-posix-compat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 AVSystem <avsystem@avsystem.com>
+ * Copyright 2023-2024 AVSystem <avsystem@avsystem.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/deps/anjay b/deps/anjay
index 4f451c7..fc26744 160000
--- a/deps/anjay
+++ b/deps/anjay
@@ -1 +1 @@
-Subproject commit 4f451c7382591072735767de28bc201c2d14e4b5
+Subproject commit fc267441825e37233d62342ef715257ef674746c