diff --git a/Makefile b/Makefile
index c9361952..d67e38e1 100644
--- a/Makefile
+++ b/Makefile
@@ -91,7 +91,7 @@ borrowed.mk: $(firstword $(MAKEFILE_LIST))
 	$(file >$@,# This file is autogenerated. Do not edit!)
 	$(foreach borrowed_file, $(BORROWED_H_SRC) $(BORROWED_C_SRC), \
 		$(file >>$@,$(addprefix $(BORROW_DIR)/, $(notdir $(borrowed_file))): | $(CURDIR)/$(BORROW_DIR)/ $(realpath $(top_srcdir)/$(borrowed_file))) \
-		$(file >>$@,$(shell echo "\t"'$$(LN_S) $(realpath $(top_srcdir)/$(borrowed_file)) $$@')) \
+		$(file >>$@,	$$(LN_S) $(realpath $(top_srcdir)/$(borrowed_file)) $$@) \
 	)
 include borrowed.mk
 
diff --git a/src/backup.c b/src/backup.c
index bf9f8dd6..a46d6101 100644
--- a/src/backup.c
+++ b/src/backup.c
@@ -1946,11 +1946,19 @@ process_block_change(ForkNumber forknum, RelFileNode rnode, BlockNumber blkno)
 	int			segno;
 	pgFile	  **file_item;
 	pgFile		f;
+#if PG_VERSION_NUM >= 180000
+	RelPathStr	rel_path_str;
+#endif
 
 	segno = blkno / RELSEG_SIZE;
 	blkno_inseg = blkno % RELSEG_SIZE;
 
+#if PG_VERSION_NUM >= 180000
+	rel_path_str = relpathperm(rnode, forknum);
+	rel_path = pstrdup(rel_path_str.str);
+#else
 	rel_path = relpathperm(rnode, forknum);
+#endif
 	if (segno > 0)
 		f.rel_path = psprintf("%s.%u", rel_path, segno);
 	else
diff --git a/src/utils/pgut.c b/src/utils/pgut.c
index 08f86df0..5bfccd08 100644
--- a/src/utils/pgut.c
+++ b/src/utils/pgut.c
@@ -996,7 +996,11 @@ handle_interrupt(SIGNAL_ARGS)
 static void
 init_cancel_handler(void)
 {
+#if PG_VERSION_NUM >= 180000
+	oldhandler = signal(SIGINT, handle_interrupt);
+#else
 	oldhandler = pqsignal(SIGINT, handle_interrupt);
+#endif
 	pqsignal(SIGQUIT, handle_interrupt);
 	pqsignal(SIGTERM, handle_interrupt);
 	pqsignal(SIGPIPE, handle_interrupt);