diff --git a/.github/workflows/build-nix.yml b/.github/workflows/build-nix.yml
index 1dccee3..625911e 100644
--- a/.github/workflows/build-nix.yml
+++ b/.github/workflows/build-nix.yml
@@ -20,6 +20,7 @@ jobs:
           - 13
           - 14
           - 15
+          - 16
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/build-win.yml b/.github/workflows/build-win.yml
index bd0f2b6..08906c0 100644
--- a/.github/workflows/build-win.yml
+++ b/.github/workflows/build-win.yml
@@ -15,11 +15,12 @@ jobs:
           - 9.5.25-1
           - 9.6.24-1
           - 10.23-1
-          - 11.19-1
-          - 12.14-1
-          - 13.10-1
-          - 14.7-1
-          - 15.2-1
+          - 11.21-1
+          - 12.16-1
+          - 13.12-1
+          - 14.9-1
+          - 15.4-1
+          - 16.0-1
         platform:
           - x64
         include:
diff --git a/versioning.c b/versioning.c
index f6fd2f3..f5d9543 100644
--- a/versioning.c
+++ b/versioning.c
@@ -625,7 +625,11 @@ insert_history_row(HeapTuple tuple,
 	int					 natts;
 
 	/* Open the history relation and obtain AccessShareLock on it. */
+#if PG_VERSION_NUM >= 160000
+	relrv = makeRangeVarFromNameList(stringToQualifiedNameList(history_relation_name, NULL));
+#else
 	relrv = makeRangeVarFromNameList(stringToQualifiedNameList(history_relation_name));
+#endif
 
 	history_relation = heap_openrv(relrv, AccessShareLock);
 
@@ -927,7 +931,11 @@ versioning_insert(TriggerData *trigdata,
 	upper.inclusive = false;
 	upper.lower = false;
 
+#if PG_VERSION_NUM >= 160000
+	range = make_range(typcache, &lower, &upper, false, NULL);
+#else
 	range = make_range(typcache, &lower, &upper, false);
+#endif
 
 	return PointerGetDatum(modify_tuple(trigdata->tg_relation, trigdata->tg_trigtuple, period_attnum, range));
 }
@@ -978,7 +986,11 @@ versioning_update(TriggerData *trigdata,
 	/* Adjust if needed. */
 	adjust_system_period(typcache, &lower, &upper, adjust_argument, relation);
 
+#if PG_VERSION_NUM >= 160000
+	range = make_range(typcache, &lower, &upper, false, NULL);
+#else
 	range = make_range(typcache, &lower, &upper, false);
+#endif
 
 	history_tuple = modify_tuple(relation, tuple, period_attnum, range);
 
@@ -993,7 +1005,11 @@ versioning_update(TriggerData *trigdata,
 	upper.infinite = true;
 	upper.inclusive = false;
 
+#if PG_VERSION_NUM >= 160000
+	range = make_range(typcache, &lower, &upper, false, NULL);
+#else
 	range = make_range(typcache, &lower, &upper, false);
+#endif
 
 	return PointerGetDatum(modify_tuple(relation, trigdata->tg_newtuple, period_attnum, range));
 }
@@ -1040,7 +1056,11 @@ versioning_delete(TriggerData *trigdata,
 	/* Adjust if needed. */
 	adjust_system_period(typcache, &lower, &upper, adjust_argument, relation);
 
+#if PG_VERSION_NUM >= 160000
+	range = make_range(typcache, &lower, &upper, false, NULL);
+#else
 	range = make_range(typcache, &lower, &upper, false);
+#endif
 
 	history_tuple = modify_tuple(relation, tuple, period_attnum, range);