diff --git a/.gitmodules b/.gitmodules
index 0f9c2de..6ecb32f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "librdkafka"]
 	path = librdkafka
-	url = https://github.com/edenhill/librdkafka.git
+	url = https://github.com/confluentinc/librdkafka.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9366412..a0bbf6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,7 +88,7 @@ if(STATIC_BUILD)
     add_library(librdkafka_static INTERFACE)
     add_dependencies(librdkafka_static librdkafka)
     ExternalProject_Get_Property(librdkafka INSTALL_DIR)
-    target_include_directories(librdkafka_static INTERFACE ${INSTALL_DIR}/include)
+    target_include_directories(librdkafka_static SYSTEM INTERFACE ${INSTALL_DIR}/include)
     target_link_libraries(librdkafka_static INTERFACE ${INSTALL_DIR}/lib/librdkafka.a)
 
     set(RDKAFKA_LIBRARY ${RDKAFKA_LIBRARY} librdkafka_static)
diff --git a/librdkafka b/librdkafka
index b47da0e..a4bf487 160000
--- a/librdkafka
+++ b/librdkafka
@@ -1 +1 @@
-Subproject commit b47da0e4eec900d9cb091d2f524e957505dbb513
+Subproject commit a4bf4876fadff054cf729fcb26d0d31e93cff44b
diff --git a/patches/librdkafka-tarantool-security-47.patch b/patches/librdkafka-tarantool-security-47.patch
index ffd1672..c6254ca 100644
--- a/patches/librdkafka-tarantool-security-47.patch
+++ b/patches/librdkafka-tarantool-security-47.patch
@@ -1,22 +1,22 @@
 diff --git a/src/rdkafka_assignment.c b/src/rdkafka_assignment.c
-index 5f05683d..1db90ece 100644
+index 6d1f0191..ee4cea61 100644
 --- a/src/rdkafka_assignment.c
 +++ b/src/rdkafka_assignment.c
-@@ -276,19 +276,22 @@ static void rd_kafka_assignment_handle_OffsetFetch(rd_kafka_t *rk,
-         if (err) {
-                 rd_kafka_dbg(rk, CGRP, "OFFSET",
-                              "Offset fetch error for %d partition(s): %s",
--                             offsets->cnt, rd_kafka_err2str(err));
-+                             offsets ? offsets->cnt : -1,
-+                             rd_kafka_err2str(err));
-                 rd_kafka_consumer_err(
-                     rk->rk_consumer.q, rd_kafka_broker_id(rkb), err, 0, NULL,
-                     NULL, RD_KAFKA_OFFSET_INVALID,
-                     "Failed to fetch committed offsets for "
-                     "%d partition(s) in group \"%s\": %s",
--                    offsets->cnt, rk->rk_group_id->str, rd_kafka_err2str(err));
-+                    offsets ? offsets->cnt : -1, rk->rk_group_id->str,
-+                    rd_kafka_err2str(err));
+@@ -315,21 +315,22 @@ static void rd_kafka_assignment_handle_OffsetFetch(rd_kafka_t *rk,
+                         rd_kafka_dbg(
+                             rk, CGRP, "OFFSET",
+                             "Offset fetch error for %d partition(s): %s",
+-                            offsets->cnt, rd_kafka_err2str(err));
++                            offsets ? offsets->cnt : -1, rd_kafka_err2str(err));
+                         rd_kafka_consumer_err(
+                             rk->rk_consumer.q, rd_kafka_broker_id(rkb), err, 0,
+                             NULL, NULL, RD_KAFKA_OFFSET_INVALID,
+                             "Failed to fetch committed offsets for "
+                             "%d partition(s) in group \"%s\": %s",
+-                            offsets->cnt, rk->rk_group_id->str,
++                            offsets ? offsets->cnt : -1, rk->rk_group_id->str,
+                             rd_kafka_err2str(err));
+                 }
          }
  
          /* Apply the fetched offsets to the assignment */
@@ -24,9 +24,7 @@ index 5f05683d..1db90ece 100644
 -
 -        rd_kafka_topic_partition_list_destroy(offsets);
 +        if (offsets) {
-+                rd_kafka_assignment_apply_offsets(rk, offsets, err);
-+                rd_kafka_topic_partition_list_destroy(offsets);
++            rd_kafka_assignment_apply_offsets(rk, offsets, err);
++            rd_kafka_topic_partition_list_destroy(offsets);
 +        }
  }
- 
-