diff --git a/src/3rdparty b/src/3rdparty
index eb87829547..e97fb41fb7 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit eb87829547270eab13c223e6de58b25bc9a0282e
+Subproject commit e97fb41fb76f88fc96e853e5ffccd99734a0d934
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 31ec8e869d..be57ba66d5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -419,7 +419,8 @@ set(MAIN_SRCS
 )
 
 set(THIRD_PARTY_SRCS
-    3rdparty/bro_inet_ntop.c
+    3rdparty/bro_inet_ntop.c # Remove in v6.1.
+    3rdparty/zeek_inet_ntop.c
     3rdparty/bsd-getopt-long.c
     3rdparty/ConvertUTF.c
     3rdparty/in_cksum.cc
@@ -606,7 +607,8 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/
 
 install(FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/ConvertUTF.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/bro_inet_ntop.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/bro_inet_ntop.h # Remove in v6.1
+        ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zeek_inet_ntop.h
         ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/bsd-getopt-long.h
         ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/modp_numtoa.h
         ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/nb_dns.h
diff --git a/src/IPAddr.cc b/src/IPAddr.cc
index 5cb3f4a998..3b4e037c97 100644
--- a/src/IPAddr.cc
+++ b/src/IPAddr.cc
@@ -6,7 +6,7 @@
 #include <string>
 #include <vector>
 
-#include "zeek/3rdparty/bro_inet_ntop.h"
+#include "zeek/3rdparty/zeek_inet_ntop.h"
 #include "zeek/Conn.h"
 #include "zeek/Hash.h"
 #include "zeek/Reporter.h"
@@ -246,7 +246,7 @@ std::string IPAddr::AsString() const
 		{
 		char s[INET_ADDRSTRLEN];
 
-		if ( ! bro_inet_ntop(AF_INET, &in6.s6_addr[12], s, INET_ADDRSTRLEN) )
+		if ( ! zeek_inet_ntop(AF_INET, &in6.s6_addr[12], s, INET_ADDRSTRLEN) )
 			return "<bad IPv4 address conversion";
 		else
 			return s;
@@ -255,7 +255,7 @@ std::string IPAddr::AsString() const
 		{
 		char s[INET6_ADDRSTRLEN];
 
-		if ( ! bro_inet_ntop(AF_INET6, in6.s6_addr, s, INET6_ADDRSTRLEN) )
+		if ( ! zeek_inet_ntop(AF_INET6, in6.s6_addr, s, INET6_ADDRSTRLEN) )
 			return "<bad IPv6 address conversion";
 		else
 			return s;
diff --git a/src/threading/Formatter.cc b/src/threading/Formatter.cc
index 784aa9033f..e9683a0687 100644
--- a/src/threading/Formatter.cc
+++ b/src/threading/Formatter.cc
@@ -6,7 +6,7 @@
 
 #include <cerrno>
 
-#include "zeek/3rdparty/bro_inet_ntop.h"
+#include "zeek/3rdparty/zeek_inet_ntop.h"
 #include "zeek/threading/MsgThread.h"
 
 using zeek::threading::Field;
@@ -28,7 +28,7 @@ std::string Formatter::Render(const threading::Value::addr_t& addr)
 		{
 		char s[INET_ADDRSTRLEN];
 
-		if ( ! bro_inet_ntop(AF_INET, &addr.in.in4, s, INET_ADDRSTRLEN) )
+		if ( ! zeek_inet_ntop(AF_INET, &addr.in.in4, s, INET_ADDRSTRLEN) )
 			return "<bad IPv4 address conversion>";
 		else
 			return s;
@@ -37,7 +37,7 @@ std::string Formatter::Render(const threading::Value::addr_t& addr)
 		{
 		char s[INET6_ADDRSTRLEN];
 
-		if ( ! bro_inet_ntop(AF_INET6, &addr.in.in6, s, INET6_ADDRSTRLEN) )
+		if ( ! zeek_inet_ntop(AF_INET6, &addr.in.in6, s, INET6_ADDRSTRLEN) )
 			return "<bad IPv6 address conversion>";
 		else
 			return s;