diff --git a/src/tools/pgindent/perltidyrc b/src/tools/pgindent/perltidyrc
index e8ae7c5d8b5..802b5df37b4 100644
--- a/src/tools/pgindent/perltidyrc
+++ b/src/tools/pgindent/perltidyrc
@@ -1,5 +1,6 @@
 --add-whitespace
 --backup-and-modify-in-place
+--backup-file-extension=/
 --delete-old-whitespace
 --entab-leading-whitespace=4
 --keep-old-blank-lines=2
diff --git a/src/tools/pgindent/pgperltidy b/src/tools/pgindent/pgperltidy
index 6098e18428e..5d9aa7c64cd 100755
--- a/src/tools/pgindent/pgperltidy
+++ b/src/tools/pgindent/pgperltidy
@@ -18,6 +18,3 @@ PERLTIDY=${PERLTIDY:-perltidy}
 ) |
 sort -u |
 xargs $PERLTIDY --profile=src/tools/pgindent/perltidyrc
-
-# perltidyrc specifies --backup-and-modify-in-place, so get rid of .bak files
-find . -type f -name '*.bak' | xargs rm