diff --git a/GNUmakefile.in b/GNUmakefile.in
index b9c5f317b6479b1141a304ec9a4567ff9f947d60..f3c5fe587e9f14ab0e10eec77d27a08bd4a5c7a4 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -65,6 +65,8 @@ $(call recurse,check-world,src/test src/pl src/interfaces/ecpg,check)
 
 $(call recurse,installcheck-world,src/test src/pl src/interfaces/ecpg contrib,installcheck)
 
+$(call recurse,maintainer-check,doc src config contrib)
+
 GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
 	./config.status $@
 
diff --git a/doc/Makefile b/doc/Makefile
index aee3cc09654d792944c8ecffc308e626ce88e886..2e5e09ef88a8dcd488d6b44574090f71b097a348 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -12,5 +12,5 @@ subdir = doc
 top_builddir = ..
 include $(top_builddir)/src/Makefile.global
 
-all distprep html man install installdirs uninstall clean distclean maintainer-clean:
+all distprep html man install installdirs uninstall clean distclean maintainer-clean maintainer-check:
 	$(MAKE) -C src $@
diff --git a/doc/src/Makefile b/doc/src/Makefile
index 30d883815aa47cf28c0f8b11d3eea64120a1ffb7..b0d4f1f5063a12c227dac86e786c5f4f0e88d8d7 100644
--- a/doc/src/Makefile
+++ b/doc/src/Makefile
@@ -4,5 +4,5 @@ subdir = doc/src
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-all distprep html man install installdirs uninstall clean distclean maintainer-clean:
+all distprep html man install installdirs uninstall clean distclean maintainer-clean maintainer-check:
 	$(MAKE) -C sgml $@
diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index add2c282c6bfb897488c1fd3e55ffbc31236ae8b..3041a53073937cec88fcea87398dc42029322cd5 100644
--- a/doc/src/sgml/Makefile
+++ b/doc/src/sgml/Makefile
@@ -279,7 +279,7 @@ MAKEINFO = makeinfo
 ##
 
 # Quick syntax check without style processing
-check: postgres.sgml $(ALMOSTALLSGML) check-tabs
+check maintainer-check: postgres.sgml $(ALMOSTALLSGML) check-tabs
 	$(NSGMLS) $(SPFLAGS) $(SGMLINCLUDE) -s $<
 
 
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 2eff4d4067f156d986684aabc875146b9dc7da11..69512ac6437db97e303e112eebc8bb029e25b9fe 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -18,9 +18,9 @@
 #
 # Meta configuration
 
-standard_targets = all install installdirs uninstall distprep clean distclean maintainer-clean coverage check installcheck
+standard_targets = all install installdirs uninstall distprep clean distclean maintainer-clean coverage check installcheck maintainer-check
 
-.PHONY: $(standard_targets) install-strip maintainer-check html man installcheck-parallel
+.PHONY: $(standard_targets) install-strip html man installcheck-parallel
 
 # make `all' the default target
 all:
diff --git a/src/include/Makefile b/src/include/Makefile
index 0d5f04932b52033fd3b12b282a27cf0fbca51d9e..1bfb4a7166d160931a87a71a5743813a6065e5c4 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -67,3 +67,6 @@ clean:
 
 distclean maintainer-clean: clean
 	rm -f pg_config.h dynloader.h pg_config_os.h stamp-h
+
+maintainer-check:
+	cd catalog && ./duplicate_oids