diff --git a/src/hnswutils.c b/src/hnswutils.c
index 8e6ac2a..ee198f3 100644
--- a/src/hnswutils.c
+++ b/src/hnswutils.c
@@ -182,10 +182,14 @@ HnswCheckNorm(HnswSupport * support, Datum value)
 Buffer
 HnswNewBuffer(Relation index, ForkNumber forkNum)
 {
+#if PG_VERSION_NUM >= 160000
+	return ExtendBufferedRel(BMR_REL(index), forkNum, NULL, EB_LOCK_FIRST | EB_SKIP_EXTENSION_LOCK);
+#else
 	Buffer		buf = ReadBufferExtended(index, forkNum, P_NEW, RBM_NORMAL, NULL);
 
 	LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
 	return buf;
+#endif
 }
 
 /*
diff --git a/src/ivfutils.c b/src/ivfutils.c
index 67a5ba4..09ee47e 100644
--- a/src/ivfutils.c
+++ b/src/ivfutils.c
@@ -139,10 +139,14 @@ IvfflatCheckMemoryUsage(Size totalSize)
 Buffer
 IvfflatNewBuffer(Relation index, ForkNumber forkNum)
 {
+#if PG_VERSION_NUM >= 160000
+	return ExtendBufferedRel(BMR_REL(index), forkNum, NULL, EB_LOCK_FIRST | EB_SKIP_EXTENSION_LOCK);
+#else
 	Buffer		buf = ReadBufferExtended(index, forkNum, P_NEW, RBM_NORMAL, NULL);
 
 	LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
 	return buf;
+#endif
 }
 
 /*