diff --git a/pgxn/neon/Makefile b/pgxn/neon/Makefile
index a28ce216c1..88f3d42647 100644
--- a/pgxn/neon/Makefile
+++ b/pgxn/neon/Makefile
@@ -4,6 +4,7 @@ MODULE_big = neon
 OBJS = \
 	$(WIN32RES) \
 	communicator.o \
+	communicator_new.o \
 	extension_server.o \
 	file_cache.o \
 	hll.o \
@@ -28,6 +29,11 @@ PG_CPPFLAGS = -I$(libpq_srcdir)
 SHLIB_LINK_INTERNAL = $(libpq)
 SHLIB_LINK = -lcurl
 
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S), Darwin)
+    SHLIB_LINK += -framework Security -framework CoreFoundation -framework SystemConfiguration
+endif
+
 EXTENSION = neon
 DATA = \
 	neon--1.0.sql \
diff --git a/pgxn/neon/communicator_new.c b/pgxn/neon/communicator_new.c
index d64e30af96..51a3358bae 100644
--- a/pgxn/neon/communicator_new.c
+++ b/pgxn/neon/communicator_new.c
@@ -344,7 +344,7 @@ callback_set_my_latch_unsafe(void)
  * FIXME: The logic from neon_get_request_lsns() needs to go here, except for
  * the last-written LSN cache stuff, which is managed by the rust code now.
  */
-uint64
+uint64_t
 callback_get_request_lsn_unsafe(void)
 {
 	/*