diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index 3b93cb96c694b27169520b24baf3c429da833394..7b74cccd00d116dc827ceb9ed4b0c70b258fd17d 100644
--- a/doc/src/sgml/Makefile
+++ b/doc/src/sgml/Makefile
@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.22 2000/10/05 19:48:16 momjian Exp $
+#    $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.23 2000/10/10 22:01:50 momjian Exp $
 #
 #----------------------------------------------------------------------------
 
@@ -78,7 +78,7 @@ APPLICATIONS= createdb.sgml createlang.sgml createuser.sgml \
 	pg_upgrade.sgml \
 	pgaccess-ref.sgml \
 	pgadmin-ref.sgml \
-	pg-config-ref.sgml \
+	pg_config-ref.sgml \
 	pg_ctl-ref.sgml \
 	pgtclsh.sgml \
 	pgtksh.sgml \
diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml
index b13993f7af0039426866962dcc593104c1854ff1..8c73a03631cd92917cd25c3067c3e383064c76e0 100644
--- a/doc/src/sgml/ref/allfiles.sgml
+++ b/doc/src/sgml/ref/allfiles.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/allfiles.sgml,v 1.22 2000/10/05 19:48:17 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/allfiles.sgml,v 1.23 2000/10/10 22:01:51 momjian Exp $
 Postgres documentation
 Complete list of usable sgml source files in this directory.
 -->
@@ -120,7 +120,7 @@ Complete list of usable sgml source files in this directory.
 <!entity ipcclean           system "ipcclean.sgml">
 <!entity pgAccess           system "pgaccess-ref.sgml">
 <!entity pgAdmin            system "pgadmin-ref.sgml">
-<!entity pgConfig           system "pg-config-ref.sgml">
+<!entity pgConfig           system "pg_config-ref.sgml">
 <!entity pgCtl              system "pg_ctl-ref.sgml">
 <!entity pgDump             system "pg_dump.sgml">
 <!entity pgDumpall          system "pg_dumpall.sgml">
diff --git a/doc/src/sgml/ref/pg-config-ref.sgml b/doc/src/sgml/ref/pg_config-ref.sgml
similarity index 100%
rename from doc/src/sgml/ref/pg-config-ref.sgml
rename to doc/src/sgml/ref/pg_config-ref.sgml
diff --git a/src/bin/Makefile b/src/bin/Makefile
index e635f5f4ce341b34a1b787063b8b98f273a2cbf9..e88dff2ab6e704c2b69c17b014592897992c885a 100644
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.32 2000/09/25 22:22:54 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.33 2000/10/10 22:01:52 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -13,7 +13,7 @@ top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
 DIRS := initdb initlocation ipcclean pg_ctl pg_dump pg_id \
-	pg_passwd psql scripts pg-config
+	pg_passwd psql scripts pg_config
 
 ifdef MULTIBYTE
 DIRS += pg_encoding
diff --git a/src/bin/pg-config/Makefile b/src/bin/pg_config/Makefile
similarity index 62%
rename from src/bin/pg-config/Makefile
rename to src/bin/pg_config/Makefile
index 150f04643b9867baa0e4834cbc356c45ac5ca34d..d4dffd8b43ecc0b5cf815f1d7538bb425953793a 100644
--- a/src/bin/pg-config/Makefile
+++ b/src/bin/pg_config/Makefile
@@ -1,12 +1,12 @@
-# $Header: /cvsroot/pgsql/src/bin/pg-config/Attic/Makefile,v 1.3 2000/09/17 13:02:34 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_config/Makefile,v 1.1 2000/10/10 22:01:55 momjian Exp $
 
-subdir = src/bin/pg-config
+subdir = src/bin/pg_config
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-all: pg-config
+all: pg_config
 
-pg-config: pg-config.sh $(top_builddir)/config.status $(top_builddir)/src/Makefile.global Makefile
+pg_config: pg_config.sh $(top_builddir)/config.status $(top_builddir)/src/Makefile.global Makefile
 	configure=`sed -n '7s,^# [^ ]*configure *,,p' $(top_builddir)/config.status` && \
 	sed -e 's,@bindir@,$(bindir),g' \
 	    -e 's,@includedir@,$(includedir),g' \
@@ -17,13 +17,13 @@ pg-config: pg-config.sh $(top_builddir)/config.status $(top_builddir)/src/Makefi
 	chmod a+x $@
 
 install: all installdirs
-	$(INSTALL_SCRIPT) pg-config $(DESTDIR)$(bindir)/pg-config
+	$(INSTALL_SCRIPT) pg_config $(DESTDIR)$(bindir)/pg_config
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 
 uninstall:
-	rm -f $(DESTDIR)$(bindir)/pg-config
+	rm -f $(DESTDIR)$(bindir)/pg_config
 
 clean distclean maintainer-clean:
-	rm -f pg-config
+	rm -f pg_config
diff --git a/src/bin/pg-config/pg-config.sh b/src/bin/pg_config/pg_config.sh
similarity index 93%
rename from src/bin/pg-config/pg-config.sh
rename to src/bin/pg_config/pg_config.sh
index 5a6a88ae3c1f8c881497a46fdc5b027e09ed17fa..6e5f18cfc074b60a3203067e32117b412a9ad180 100644
--- a/src/bin/pg-config/pg-config.sh
+++ b/src/bin/pg_config/pg_config.sh
@@ -7,7 +7,7 @@
 # Author:  Peter Eisentraut <peter_e@gmx.net> 
 # Public domain
 
-# $Header: /cvsroot/pgsql/src/bin/pg-config/Attic/pg-config.sh,v 1.1 2000/08/26 13:08:16 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_config/Attic/pg_config.sh,v 1.1 2000/10/10 22:01:55 momjian Exp $
 
 me=`basename $0`
 
@@ -67,4 +67,4 @@ do
     eval "echo $thing"
 done
 
-# end of pg-config
+# end of pg_config