diff --git a/contrib/oid2name/Makefile b/contrib/oid2name/Makefile
index d5dd1be0308f66465c88699434ad1314dcb53ea9..ce043550afbba9f1294801c3c74eb456185e22ef 100644
--- a/contrib/oid2name/Makefile
+++ b/contrib/oid2name/Makefile
@@ -1,4 +1,7 @@
-# $PostgreSQL: pgsql/contrib/oid2name/Makefile,v 1.10 2007/11/10 23:59:51 momjian Exp $
+# $PostgreSQL: pgsql/contrib/oid2name/Makefile,v 1.11 2010/05/12 11:33:07 momjian Exp $
+
+PGFILEDESC = "oid2name - examine the file structure"
+PGAPPICON=win32
 
 PROGRAM = oid2name
 OBJS	= oid2name.o
diff --git a/contrib/pg_standby/Makefile b/contrib/pg_standby/Makefile
index 74e1358cb052665ca4c261ba61eb4a483653d0d8..5e6bbd91458be6121e86e80d237aa72265bbae4a 100644
--- a/contrib/pg_standby/Makefile
+++ b/contrib/pg_standby/Makefile
@@ -1,4 +1,7 @@
-# $PostgreSQL: pgsql/contrib/pg_standby/Makefile,v 1.5 2009/07/16 09:59:46 heikki Exp $
+# $PostgreSQL: pgsql/contrib/pg_standby/Makefile,v 1.6 2010/05/12 11:33:07 momjian Exp $
+
+PGFILEDESC = "pg_standby - supports creation of a warm standby"
+PGAPPICON=win32
 
 PROGRAM = pg_standby
 OBJS	= pg_standby.o
diff --git a/contrib/pg_upgrade/Makefile b/contrib/pg_upgrade/Makefile
index 87d72d977fa3ea66b9373b6e9ede761d7e83381c..870f397892989434101dd8452a30476330bcd94d 100644
--- a/contrib/pg_upgrade/Makefile
+++ b/contrib/pg_upgrade/Makefile
@@ -6,17 +6,18 @@
 # This Makefile generates an executable and a shared object file
 #
 
-PROGRAM      = pg_upgrade
-OBJS         = check.o controldata.o dump.o exec.o file.o function.o info.o \
-		option.o page.o pg_upgrade.o relfilenode.o server.o \
-		tablespace.o util.o version.o version_old_8_3.o $(WIN32RES)
+PGFILEDESC = "pg_upgrade - an in-place binary upgrade utility"
+PGAPPICON = win32
 
-PG_CPPFLAGS  = -DFRONTEND -DDLSUFFIX=\"$(DLSUFFIX)\" -I$(srcdir) -I$(libpq_srcdir)
-PG_LIBS      = $(libpq_pgport)
+PROGRAM  = pg_upgrade
+OBJS = check.o controldata.o dump.o exec.o file.o function.o info.o \
+       option.o page.o pg_upgrade.o relfilenode.o server.o \
+       tablespace.o util.o version.o version_old_8_3.o $(WIN32RES)
+
+MODULES = pg_upgrade_sysoids
 
-PGFILEDESC   = "pg_upgrade - In-Place Binary Upgrade Utility"
-PGAPPICON    = win32
-MODULES      = pg_upgrade_sysoids
+PG_CPPFLAGS  = -DFRONTEND -DDLSUFFIX=\"$(DLSUFFIX)\" -I$(srcdir) -I$(libpq_srcdir)
+PG_LIBS = $(libpq_pgport)
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/pgbench/Makefile b/contrib/pgbench/Makefile
index 0570705dad5be04c867eb5642393aeb3ffc78403..786ba10fd9571ad8ec626ccb258f2de747583b21 100644
--- a/contrib/pgbench/Makefile
+++ b/contrib/pgbench/Makefile
@@ -1,4 +1,7 @@
-# $PostgreSQL: pgsql/contrib/pgbench/Makefile,v 1.17 2009/08/03 18:30:55 tgl Exp $
+# $PostgreSQL: pgsql/contrib/pgbench/Makefile,v 1.18 2010/05/12 11:33:08 momjian Exp $
+
+PGFILEDESC = "pgbench - a simple program for running benchmark tests"
+PGAPPICON=win32
 
 PROGRAM = pgbench
 OBJS	= pgbench.o
diff --git a/contrib/vacuumlo/Makefile b/contrib/vacuumlo/Makefile
index dc1e9524bc5ca314d9da2fa16c55d1e768856144..4c68e695781252b37ecd3e5370e2922b984a0673 100644
--- a/contrib/vacuumlo/Makefile
+++ b/contrib/vacuumlo/Makefile
@@ -1,4 +1,7 @@
-# $PostgreSQL: pgsql/contrib/vacuumlo/Makefile,v 1.17 2007/11/10 23:59:52 momjian Exp $
+# $PostgreSQL: pgsql/contrib/vacuumlo/Makefile,v 1.18 2010/05/12 11:33:08 momjian Exp $
+
+PGFILEDESC = "vacuumlo - removes orphaned large objects"
+PGAPPICON=win32
 
 PROGRAM = vacuumlo
 OBJS	= vacuumlo.o
diff --git a/src/backend/Makefile b/src/backend/Makefile
index 5916aaa5112a09516a727eff13fa045e0171348e..6af63db92cf401161c9f952b093e69dbe64ddbaf 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -5,11 +5,13 @@
 # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/backend/Makefile,v 1.141 2010/01/20 23:12:03 tgl Exp $
+# $PostgreSQL: pgsql/src/backend/Makefile,v 1.142 2010/05/12 11:33:09 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 PGFILEDESC = "PostgreSQL Server"
+PGAPPICON=win32
+
 subdir = src/backend
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
index 7198f9438a68091414927d2a05d3e4c8f02a6e8f..4f8771569f03167101f30ce7dea7fed846a79b78 100644
--- a/src/bin/initdb/Makefile
+++ b/src/bin/initdb/Makefile
@@ -5,11 +5,13 @@
 # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.59 2010/01/02 16:57:58 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.60 2010/05/12 11:33:09 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 PGFILEDESC = "initdb - initialize a new database cluster"
+PGAPPICON=win32
+
 subdir = src/bin/initdb
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
index a9b9f49d64a5dd971953889fb15ec7aa1974b537..43558749654f15fac3057c447c9bf82096f7b821 100644
--- a/src/bin/pg_config/Makefile
+++ b/src/bin/pg_config/Makefile
@@ -4,11 +4,13 @@
 #
 # Copyright (c) 1998-2010, PostgreSQL Global Development Group
 #
-# $PostgreSQL: pgsql/src/bin/pg_config/Makefile,v 1.23 2010/01/02 16:57:58 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/pg_config/Makefile,v 1.24 2010/05/12 11:33:09 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 PGFILEDESC = "pg_config - report configuration information"
+PGAPPICON=win32
+
 subdir = src/bin/pg_config
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
diff --git a/src/bin/pg_controldata/Makefile b/src/bin/pg_controldata/Makefile
index f3de00a34e6b0e23ee2fd54ed22e3d4711ea7a75..c12bf3355701413da6037f90ad9eee49d2c5af4e 100644
--- a/src/bin/pg_controldata/Makefile
+++ b/src/bin/pg_controldata/Makefile
@@ -4,11 +4,13 @@
 #
 # Copyright (c) 1998-2010, PostgreSQL Global Development Group
 #
-# $PostgreSQL: pgsql/src/bin/pg_controldata/Makefile,v 1.20 2010/01/02 16:57:58 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/pg_controldata/Makefile,v 1.21 2010/05/12 11:33:09 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 PGFILEDESC = "pg_controldata - reads the data from pg_control"
+PGAPPICON=win32
+
 subdir = src/bin/pg_controldata
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
diff --git a/src/bin/pg_ctl/Makefile b/src/bin/pg_ctl/Makefile
index 4a85b797303a01f7fd281d9d2962b84c55830016..32a4fc92cb7b8927e14efab440ba14df3c1010fe 100644
--- a/src/bin/pg_ctl/Makefile
+++ b/src/bin/pg_ctl/Makefile
@@ -5,11 +5,13 @@
 # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/pg_ctl/Makefile,v 1.28 2010/01/02 16:57:58 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/pg_ctl/Makefile,v 1.29 2010/05/12 11:33:09 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 PGFILEDESC = "pg_ctl - starts/stops/restarts the PostgreSQL server"
+PGAPPICON=win32
+
 subdir = src/bin/pg_ctl
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
index d0920c52ca166cc4d6d8d10cb5fd6d3f9b7d08fd..2eeb099b73d5e2ee18ff75c927a95074c839f719 100644
--- a/src/bin/pg_dump/Makefile
+++ b/src/bin/pg_dump/Makefile
@@ -5,11 +5,13 @@
 # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.69 2010/01/02 16:57:58 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.70 2010/05/12 11:33:09 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 PGFILEDESC = "pg_dump/pg_restore/pg_dumpall - backup and restore PostgreSQL databases"
+PGAPPICON=win32
+
 subdir = src/bin/pg_dump
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
diff --git a/src/bin/pg_resetxlog/Makefile b/src/bin/pg_resetxlog/Makefile
index 3d836678c0d0c706d5a3971b72cde2362f566289..57efc8d6e64f71ac8363f2fe3213bc9085629fba 100644
--- a/src/bin/pg_resetxlog/Makefile
+++ b/src/bin/pg_resetxlog/Makefile
@@ -4,11 +4,13 @@
 #
 # Copyright (c) 1998-2010, PostgreSQL Global Development Group
 #
-# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.22 2010/01/02 16:57:59 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.23 2010/05/12 11:33:10 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 PGFILEDESC = "pg_resetxlog - reset PostgreSQL WAL log"
+PGAPPICON=win32
+
 subdir = src/bin/pg_resetxlog
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
diff --git a/src/bin/pgevent/Makefile b/src/bin/pgevent/Makefile
index e0f27e5d5a5f219f9cb2d158394a788951008de6..013b801c64f103601b46d6e15e7a94a80d22ce35 100644
--- a/src/bin/pgevent/Makefile
+++ b/src/bin/pgevent/Makefile
@@ -7,6 +7,8 @@
 #-------------------------------------------------------------------------
 
 PGFILEDESC = "Eventlog message formatter"
+PGAPPICON=win32
+
 PGFILESHLIB = 1
 subdir = src/bin/pgevent
 top_builddir = ../../..
diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
index 7020befb7059ef6652917274abef77e2f7104bbd..80e2daba13148bf549e5a5f68a0b8540a15ca7b3 100644
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -5,12 +5,13 @@
 # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.68 2010/01/02 16:57:59 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.69 2010/05/12 11:33:10 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 PGFILEDESC = "psql - the PostgreSQL interactive terminal"
 PGAPPICON=win32
+
 subdir = src/bin/psql
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile
index 5a7616457a432840266ca5653d4f36fb8f370c4e..5cd61ad7c3d3a375a12b910fac4f3bae6167a7f7 100644
--- a/src/bin/scripts/Makefile
+++ b/src/bin/scripts/Makefile
@@ -5,11 +5,13 @@
 # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/scripts/Makefile,v 1.44 2010/01/02 16:58:00 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/scripts/Makefile,v 1.45 2010/05/12 11:33:10 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 PGFILEDESC = "PostgreSQL utility"
+PGAPPICON=win32
+
 subdir = src/bin/scripts
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
index 39f9068ef4d278b448e554f2e4d460a7355e8f0c..3c0a4c732f041e00f1684b502b2de01b96195f2a 100644
--- a/src/interfaces/ecpg/preproc/Makefile
+++ b/src/interfaces/ecpg/preproc/Makefile
@@ -4,11 +4,13 @@
 #
 # Copyright (c) 1998-2010, PostgreSQL Global Development Group
 #
-# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.148 2010/01/02 16:58:11 momjian Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.149 2010/05/12 11:33:10 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 PGFILEDESC = "ecpg - embedded SQL precompiler for C"
+PGAPPICON=win32
+
 subdir = src/interfaces/ecpg/preproc
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global