diff --git a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
index 5cbc8f0c71f978cc29ede55236dafc74f2709b1b..f065f84bfb1114ca4685520293a6be75d71539fa 100644
--- a/contrib/adminpack/Makefile
+++ b/contrib/adminpack/Makefile
@@ -1,11 +1,12 @@
 # contrib/adminpack/Makefile
 
 MODULE_big = adminpack
-OBJS = adminpack.o
+OBJS = adminpack.o $(WIN32RES)
 PG_CPPFLAGS = -I$(libpq_srcdir)
 
 EXTENSION = adminpack
 DATA = adminpack--1.0.sql
+PGFILEDESC = "adminpack - support functions for pgAdmin"
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/auth_delay/Makefile b/contrib/auth_delay/Makefile
index 09d2d5418c59fab11c0f548e7b7dda032773b831..4b86ec37f05c0b14f578ec106af0d2df8b6e93e5 100644
--- a/contrib/auth_delay/Makefile
+++ b/contrib/auth_delay/Makefile
@@ -1,6 +1,7 @@
 # contrib/auth_delay/Makefile
 
 MODULES = auth_delay
+PGFILEDESC = "auth_delay - delay authentication failure reports"
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/auto_explain/Makefile b/contrib/auto_explain/Makefile
index 2d1443fe48e260eb6bed64c2c9f65f49f2aade58..fcf36c5ab09ba0c47bb9a20d756c095830245ee5 100644
--- a/contrib/auto_explain/Makefile
+++ b/contrib/auto_explain/Makefile
@@ -1,7 +1,8 @@
 # contrib/auto_explain/Makefile
 
 MODULE_big = auto_explain
-OBJS = auto_explain.o
+OBJS = auto_explain.o $(WIN32RES)
+PGFILEDESC = "auto_explain - logging facility for execution plans"
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/btree_gin/Makefile b/contrib/btree_gin/Makefile
index 09fd3e6e11da127825cd4d913f5a75151b91e4d2..0492091599ef49c482e660bbd92d606c26144755 100644
--- a/contrib/btree_gin/Makefile
+++ b/contrib/btree_gin/Makefile
@@ -1,10 +1,11 @@
 # contrib/btree_gin/Makefile
 
 MODULE_big = btree_gin
-OBJS = btree_gin.o
+OBJS = btree_gin.o $(WIN32RES)
 
 EXTENSION = btree_gin
 DATA = btree_gin--1.0.sql btree_gin--unpackaged--1.0.sql
+PGFILEDESC = "btree_gin - B-tree equivalent GIN operator classes"
 
 REGRESS = install_btree_gin int2 int4 int8 float4 float8 money oid \
 	timestamp timestamptz time timetz date interval \
diff --git a/contrib/btree_gist/Makefile b/contrib/btree_gist/Makefile
index ba4af14658935d3c6a4847add8f8a7ca2dd30d36..19a59293e93031ecac9998d32bec038bed9c17e0 100644
--- a/contrib/btree_gist/Makefile
+++ b/contrib/btree_gist/Makefile
@@ -6,10 +6,11 @@ OBJS =  btree_gist.o btree_utils_num.o btree_utils_var.o btree_int2.o \
         btree_int4.o btree_int8.o btree_float4.o btree_float8.o btree_cash.o \
         btree_oid.o btree_ts.o btree_time.o btree_date.o btree_interval.o \
         btree_macaddr.o btree_inet.o btree_text.o btree_bytea.o btree_bit.o \
-        btree_numeric.o
+        btree_numeric.o $(WIN32RES)
 
 EXTENSION = btree_gist
 DATA = btree_gist--1.0.sql btree_gist--unpackaged--1.0.sql
+PGFILEDESC = "btree_gist - B-tree equivalent GIST operator classes"
 
 REGRESS = init int2 int4 int8 float4 float8 cash oid timestamp timestamptz \
         time timetz date interval macaddr inet cidr text varchar char bytea \
diff --git a/contrib/chkpass/Makefile b/contrib/chkpass/Makefile
index b775aef17d97f161f29dbb3861847452aaafaf15..a2599ea239384ee6251579def2d38af1c65a28c0 100644
--- a/contrib/chkpass/Makefile
+++ b/contrib/chkpass/Makefile
@@ -1,10 +1,11 @@
 # contrib/chkpass/Makefile
 
 MODULE_big = chkpass
-OBJS = chkpass.o
+OBJS = chkpass.o $(WIN32RES)
 
 EXTENSION = chkpass
 DATA = chkpass--1.0.sql chkpass--unpackaged--1.0.sql
+PGFILEDESC = "chkpass - encrypted password data type"
 
 SHLIB_LINK = $(filter -lcrypt, $(LIBS))
 
diff --git a/contrib/citext/Makefile b/contrib/citext/Makefile
index 65942528dd030090a6a41b994c59bb09b8226df4..267854b5de7a0aaff9b25117923fd6d5c5d9cb6d 100644
--- a/contrib/citext/Makefile
+++ b/contrib/citext/Makefile
@@ -4,6 +4,7 @@ MODULES = citext
 
 EXTENSION = citext
 DATA = citext--1.0.sql citext--unpackaged--1.0.sql
+PGFILEDESC = "citext - case-insensitive character string data type"
 
 REGRESS = citext
 
diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile
index b5cd5d0f33f69578d0aa6eadf4dfa32561f9f1ce..67f7867761b7d0d3baecb4910551e36d5e071e08 100644
--- a/contrib/cube/Makefile
+++ b/contrib/cube/Makefile
@@ -1,10 +1,11 @@
 # contrib/cube/Makefile
 
 MODULE_big = cube
-OBJS= cube.o cubeparse.o
+OBJS= cube.o cubeparse.o $(WIN32RES)
 
 EXTENSION = cube
 DATA = cube--1.0.sql cube--unpackaged--1.0.sql
+PGFILEDESC = "cube - multidimensional cube data type"
 
 REGRESS = cube
 
diff --git a/contrib/dblink/Makefile b/contrib/dblink/Makefile
index 32314a0abb48e228507080ee989af922c1f7150b..9242ed74dc82d28d1610e9e3a26f06cd2b1ce195 100644
--- a/contrib/dblink/Makefile
+++ b/contrib/dblink/Makefile
@@ -1,13 +1,14 @@
 # contrib/dblink/Makefile
 
 MODULE_big = dblink
-OBJS	= dblink.o
+OBJS	= dblink.o $(WIN32RES)
 PG_CPPFLAGS = -I$(libpq_srcdir)
 SHLIB_LINK = $(libpq)
 SHLIB_PREREQS = submake-libpq
 
 EXTENSION = dblink
 DATA = dblink--1.1.sql dblink--1.0--1.1.sql dblink--unpackaged--1.0.sql
+PGFILEDESC = "dblink - connect to other PostgreSQL databases"
 
 REGRESS = dblink
 
diff --git a/contrib/dict_int/Makefile b/contrib/dict_int/Makefile
index 3a3fc368dc6ade3ccef13cd72eb96514c33af1df..f6ae24aa4dad7d2bb305abb9d7dfb54ff216e3cf 100644
--- a/contrib/dict_int/Makefile
+++ b/contrib/dict_int/Makefile
@@ -1,10 +1,11 @@
 # contrib/dict_int/Makefile
 
 MODULE_big = dict_int
-OBJS = dict_int.o
+OBJS = dict_int.o $(WIN32RES)
 
 EXTENSION = dict_int
 DATA = dict_int--1.0.sql dict_int--unpackaged--1.0.sql
+PGFILEDESC = "dict_int - add-on dictionary template for full-text search"
 
 REGRESS = dict_int
 
diff --git a/contrib/dict_xsyn/Makefile b/contrib/dict_xsyn/Makefile
index ce92baa47895290012db15a28d7f9e33e8d4ee2f..0c401cf3c87f0fa00c44509aa59564de7f1f40cd 100644
--- a/contrib/dict_xsyn/Makefile
+++ b/contrib/dict_xsyn/Makefile
@@ -1,11 +1,12 @@
 # contrib/dict_xsyn/Makefile
 
 MODULE_big = dict_xsyn
-OBJS = dict_xsyn.o
+OBJS = dict_xsyn.o $(WIN32RES)
 
 EXTENSION = dict_xsyn
 DATA = dict_xsyn--1.0.sql dict_xsyn--unpackaged--1.0.sql
 DATA_TSEARCH = xsyn_sample.rules
+PGFILEDESC = "dict_xsyn - add-on dictionary template for full-text search"
 
 REGRESS = dict_xsyn
 
diff --git a/contrib/dummy_seclabel/Makefile b/contrib/dummy_seclabel/Makefile
index 105400f5f98a86ad5fff1d3d3af14096fcb7804d..e69aa1ff6c44a73e002366f1f0db779672f3c99d 100644
--- a/contrib/dummy_seclabel/Makefile
+++ b/contrib/dummy_seclabel/Makefile
@@ -1,6 +1,7 @@
 # contrib/dummy_seclabel/Makefile
 
 MODULES = dummy_seclabel
+PGFILEDESC = "dummy_seclabel - regression testing of the SECURITY LABEL statement"
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/earthdistance/Makefile b/contrib/earthdistance/Makefile
index 48a7cf8c7c021fffc660a2ed4a93eeaf55800d2c..93dcbe3a31c5ee5caaee2905288af9ce6157a3a4 100644
--- a/contrib/earthdistance/Makefile
+++ b/contrib/earthdistance/Makefile
@@ -4,6 +4,7 @@ MODULES = earthdistance
 
 EXTENSION = earthdistance
 DATA = earthdistance--1.0.sql earthdistance--unpackaged--1.0.sql
+PGFILEDESC = "earthdistance - calculate distances on the surface of the Earth"
 
 REGRESS = earthdistance
 REGRESS_OPTS = --extra-install=contrib/cube
diff --git a/contrib/file_fdw/Makefile b/contrib/file_fdw/Makefile
index 4616cec633cddbf00952c525897eca7f2c95df19..4da9f2d697a2802429810b52902c10af1a9e0117 100644
--- a/contrib/file_fdw/Makefile
+++ b/contrib/file_fdw/Makefile
@@ -4,6 +4,7 @@ MODULES = file_fdw
 
 EXTENSION = file_fdw
 DATA = file_fdw--1.0.sql
+PGFILEDESC = "file_fdw - foreign data wrapper for files"
 
 REGRESS = file_fdw
 
diff --git a/contrib/fuzzystrmatch/Makefile b/contrib/fuzzystrmatch/Makefile
index 834b679b102a32c0fcd732c6d5dbecea59529777..024265d47900b6ac3e432daf8457ec7708d689b0 100644
--- a/contrib/fuzzystrmatch/Makefile
+++ b/contrib/fuzzystrmatch/Makefile
@@ -1,10 +1,11 @@
 # contrib/fuzzystrmatch/Makefile
 
 MODULE_big = fuzzystrmatch
-OBJS = fuzzystrmatch.o dmetaphone.o
+OBJS = fuzzystrmatch.o dmetaphone.o $(WIN32RES)
 
 EXTENSION = fuzzystrmatch
 DATA = fuzzystrmatch--1.0.sql fuzzystrmatch--unpackaged--1.0.sql
+PGFILEDESC = "fuzzystrmatch - similarities and distance between strings"
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/hstore/Makefile b/contrib/hstore/Makefile
index 2b60fbed0e0cbd332e6a70c19562acffddbc8645..3193668a0e7ee966173b3d91cf2d9443dea825ff 100644
--- a/contrib/hstore/Makefile
+++ b/contrib/hstore/Makefile
@@ -2,12 +2,13 @@
 
 MODULE_big = hstore
 OBJS = hstore_io.o hstore_op.o hstore_gist.o hstore_gin.o hstore_compat.o \
-	crc32.o
+	crc32.o $(WIN32RES)
 
 EXTENSION = hstore
 DATA = hstore--1.3.sql hstore--1.2--1.3.sql \
 	hstore--1.1--1.2.sql hstore--1.0--1.1.sql \
 	hstore--unpackaged--1.0.sql
+PGFILEDESC = "hstore - key/value pair data type"
 
 REGRESS = hstore
 
diff --git a/contrib/intarray/Makefile b/contrib/intarray/Makefile
index 71f820ec4a8cabba828177cb9a909775f3d32508..920c5b1ba032217db405b5dba5a7128db43cd689 100644
--- a/contrib/intarray/Makefile
+++ b/contrib/intarray/Makefile
@@ -1,10 +1,12 @@
 # contrib/intarray/Makefile
 
 MODULE_big = _int
-OBJS = _int_bool.o _int_gist.o _int_op.o _int_tool.o _intbig_gist.o _int_gin.o
+OBJS = _int_bool.o _int_gist.o _int_op.o _int_tool.o \
+	_intbig_gist.o _int_gin.o $(WIN32RES)
 
 EXTENSION = intarray
 DATA = intarray--1.0.sql intarray--unpackaged--1.0.sql
+PGFILEDESC = "intarray - functions and operators for arrays of integers"
 
 REGRESS = _int
 
diff --git a/contrib/isn/Makefile b/contrib/isn/Makefile
index bd8f193e9383f973f6a38af13bea05233f5797a6..75c07a8296d8fc140e36a6436b25501cfd46e45e 100644
--- a/contrib/isn/Makefile
+++ b/contrib/isn/Makefile
@@ -4,6 +4,7 @@ MODULES = isn
 
 EXTENSION = isn
 DATA = isn--1.0.sql isn--unpackaged--1.0.sql
+PGFILEDESC = "isn - data types for international product numbering standards"
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/lo/Makefile b/contrib/lo/Makefile
index 66b337c17a6c1f3f986893c2b55dda727f0a8102..b956aa4fa127ece30812ea6e98693c4f57e9b20c 100644
--- a/contrib/lo/Makefile
+++ b/contrib/lo/Makefile
@@ -4,6 +4,7 @@ MODULES = lo
 
 EXTENSION = lo
 DATA = lo--1.0.sql lo--unpackaged--1.0.sql
+PGFILEDESC = "lo - management for large objects"
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/ltree/Makefile b/contrib/ltree/Makefile
index 65d42f875f0dc3086b40549fb3a61fa207f71d5a..a41e45723d9cb4d575eb97c08c23aeee905547bb 100644
--- a/contrib/ltree/Makefile
+++ b/contrib/ltree/Makefile
@@ -2,11 +2,12 @@
 
 MODULE_big = ltree
 OBJS = 	ltree_io.o ltree_op.o lquery_op.o _ltree_op.o crc32.o \
-	ltxtquery_io.o ltxtquery_op.o ltree_gist.o _ltree_gist.o
+	ltxtquery_io.o ltxtquery_op.o ltree_gist.o _ltree_gist.o $(WIN32RES)
 PG_CPPFLAGS = -DLOWER_NODE
 
 EXTENSION = ltree
 DATA = ltree--1.0.sql ltree--unpackaged--1.0.sql
+PGFILEDESC = "ltree - hierarchical label data type"
 
 REGRESS = ltree
 
diff --git a/contrib/oid2name/Makefile b/contrib/oid2name/Makefile
index f695b4a84e18f2f0f1d8f230335c02f378f3167f..3414b4a5ccab8482b8d7e2cf6b3ebf7ead7f33b4 100644
--- a/contrib/oid2name/Makefile
+++ b/contrib/oid2name/Makefile
@@ -4,7 +4,7 @@ PGFILEDESC = "oid2name - examine the file structure"
 PGAPPICON = win32
 
 PROGRAM = oid2name
-OBJS	= oid2name.o
+OBJS	= oid2name.o $(WIN32RES)
 
 PG_CPPFLAGS = -I$(libpq_srcdir)
 PG_LIBS = $(libpq_pgport)
diff --git a/contrib/pageinspect/Makefile b/contrib/pageinspect/Makefile
index ee78cb29894f4797ffe1b96d16d0ac6fc3d3f688..f10229db4820c6622aaf59271a7768571e7d2259 100644
--- a/contrib/pageinspect/Makefile
+++ b/contrib/pageinspect/Makefile
@@ -1,11 +1,12 @@
 # contrib/pageinspect/Makefile
 
 MODULE_big	= pageinspect
-OBJS		= rawpage.o heapfuncs.o btreefuncs.o fsmfuncs.o
+OBJS		= rawpage.o heapfuncs.o btreefuncs.o fsmfuncs.o $(WIN32RES)
 
 EXTENSION = pageinspect
 DATA = pageinspect--1.2.sql pageinspect--1.0--1.1.sql \
 	pageinspect--1.1--1.2.sql pageinspect--unpackaged--1.0.sql
+PGFILEDESC = "pageinspect - functions to inspect contents of database pages"
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/passwordcheck/Makefile b/contrib/passwordcheck/Makefile
index 4829bfd1f34af36f6628db4c56ce6c5d7c152db2..4652aeb3d7cbed30c4ff4eb5eeec34735f661230 100644
--- a/contrib/passwordcheck/Makefile
+++ b/contrib/passwordcheck/Makefile
@@ -1,7 +1,8 @@
 # contrib/passwordcheck/Makefile
 
 MODULE_big = passwordcheck
-OBJS = passwordcheck.o
+OBJS = passwordcheck.o $(WIN32RES)
+PGFILEDESC = "passwordcheck - strengthen user password checks"
 
 # uncomment the following two lines to enable cracklib support
 # PG_CPPFLAGS = -DUSE_CRACKLIB '-DCRACKLIB_DICTPATH="/usr/lib/cracklib_dict"'
diff --git a/contrib/pg_archivecleanup/Makefile b/contrib/pg_archivecleanup/Makefile
index 39c55d8713cb3456daa30c18a509d8d300772f83..ab5239078c57093586b8fbbfba08011b27c93b36 100644
--- a/contrib/pg_archivecleanup/Makefile
+++ b/contrib/pg_archivecleanup/Makefile
@@ -4,7 +4,7 @@ PGFILEDESC = "pg_archivecleanup - cleans archive when used with streaming replic
 PGAPPICON = win32
 
 PROGRAM = pg_archivecleanup
-OBJS	= pg_archivecleanup.o
+OBJS	= pg_archivecleanup.o $(WIN32RES)
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/pg_buffercache/Makefile b/contrib/pg_buffercache/Makefile
index 323c0ac8ed18d17cbb3f5afa95e02c6d82c9947a..c5297d98d481101220ea5449a818ff7837ce7a03 100644
--- a/contrib/pg_buffercache/Makefile
+++ b/contrib/pg_buffercache/Makefile
@@ -1,10 +1,11 @@
 # contrib/pg_buffercache/Makefile
 
 MODULE_big = pg_buffercache
-OBJS = pg_buffercache_pages.o
+OBJS = pg_buffercache_pages.o $(WIN32RES)
 
 EXTENSION = pg_buffercache
 DATA = pg_buffercache--1.0.sql pg_buffercache--unpackaged--1.0.sql
+PGFILEDESC = "pg_buffercache - monitoring of shared buffer cache in real-time"
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/pg_freespacemap/Makefile b/contrib/pg_freespacemap/Makefile
index b2e3ba3aa3575a1b457806949480440e3e6aad3d..5760d9fe51f10699164e37e9be9da579275b8b96 100644
--- a/contrib/pg_freespacemap/Makefile
+++ b/contrib/pg_freespacemap/Makefile
@@ -1,10 +1,11 @@
 # contrib/pg_freespacemap/Makefile
 
 MODULE_big = pg_freespacemap
-OBJS = pg_freespacemap.o
+OBJS = pg_freespacemap.o $(WIN32RES)
 
 EXTENSION = pg_freespacemap
 DATA = pg_freespacemap--1.0.sql pg_freespacemap--unpackaged--1.0.sql
+PGFILEDESC = "pg_freespacemap - monitoring of free space map"
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/pg_prewarm/Makefile b/contrib/pg_prewarm/Makefile
index 176a29a0036b6a4f6406a0caccd44e589f99cc33..eeba50267240e3143ea74b001ddc9519fffc2c9e 100644
--- a/contrib/pg_prewarm/Makefile
+++ b/contrib/pg_prewarm/Makefile
@@ -1,10 +1,11 @@
 # contrib/pg_prewarm/Makefile
 
 MODULE_big = pg_prewarm
-OBJS = pg_prewarm.o
+OBJS = pg_prewarm.o $(WIN32RES)
 
 EXTENSION = pg_prewarm
 DATA = pg_prewarm--1.0.sql
+PGFILEDESC = "pg_prewarm - preload relation data into system buffer cache"
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/pg_standby/Makefile b/contrib/pg_standby/Makefile
index b7c6ae95e7fff3f2eaece4385617bac0dd0a83f6..0bca2f8e9ed4ed76ad237997fca32c8b7c24fd6d 100644
--- a/contrib/pg_standby/Makefile
+++ b/contrib/pg_standby/Makefile
@@ -4,7 +4,7 @@ PGFILEDESC = "pg_standby - supports creation of a warm standby"
 PGAPPICON = win32
 
 PROGRAM = pg_standby
-OBJS	= pg_standby.o
+OBJS	= pg_standby.o $(WIN32RES)
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/pg_stat_statements/Makefile b/contrib/pg_stat_statements/Makefile
index 95a27670067d1493987487413c6b2eb807357150..270990964c694070a665cfccb4d80375b9b95302 100644
--- a/contrib/pg_stat_statements/Makefile
+++ b/contrib/pg_stat_statements/Makefile
@@ -1,11 +1,12 @@
 # contrib/pg_stat_statements/Makefile
 
 MODULE_big = pg_stat_statements
-OBJS = pg_stat_statements.o
+OBJS = pg_stat_statements.o $(WIN32RES)
 
 EXTENSION = pg_stat_statements
 DATA = pg_stat_statements--1.2.sql pg_stat_statements--1.1--1.2.sql \
 	pg_stat_statements--1.0--1.1.sql pg_stat_statements--unpackaged--1.0.sql
+PGFILEDESC = "pg_stat_statements - execution statistics of SQL statements"
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/pg_test_fsync/Makefile b/contrib/pg_test_fsync/Makefile
index b456429098865e0a1cbd5a122dad6787186f08c1..15afba768299d0f99c92d25311227398a9d8c111 100644
--- a/contrib/pg_test_fsync/Makefile
+++ b/contrib/pg_test_fsync/Makefile
@@ -4,7 +4,7 @@ PGFILEDESC = "pg_test_fsync - test various disk sync methods"
 PGAPPICON = win32
 
 PROGRAM  = pg_test_fsync
-OBJS = pg_test_fsync.o
+OBJS = pg_test_fsync.o $(WIN32RES)
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/pg_test_timing/Makefile b/contrib/pg_test_timing/Makefile
index b8b266a2fcd42edcf6fb08a21ec8f10f57da4320..8b37aa8249655382779fc3091f72fffa07637550 100644
--- a/contrib/pg_test_timing/Makefile
+++ b/contrib/pg_test_timing/Makefile
@@ -4,7 +4,7 @@ PGFILEDESC = "pg_test_timing - test timing overhead"
 PGAPPICON = win32
 
 PROGRAM  = pg_test_timing
-OBJS = pg_test_timing.o
+OBJS = pg_test_timing.o $(WIN32RES)
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/pg_trgm/Makefile b/contrib/pg_trgm/Makefile
index 0d549f8b6c300bf2490c40035a61e505ebf93085..e081a1e5e9fea35e8dfc26853e2603030b10b8cf 100644
--- a/contrib/pg_trgm/Makefile
+++ b/contrib/pg_trgm/Makefile
@@ -1,10 +1,11 @@
 # contrib/pg_trgm/Makefile
 
 MODULE_big = pg_trgm
-OBJS = trgm_op.o trgm_gist.o trgm_gin.o trgm_regexp.o
+OBJS = trgm_op.o trgm_gist.o trgm_gin.o trgm_regexp.o $(WIN32RES)
 
 EXTENSION = pg_trgm
 DATA = pg_trgm--1.1.sql pg_trgm--1.0--1.1.sql pg_trgm--unpackaged--1.0.sql
+PGFILEDESC = "pg_trgm - trigram matching"
 
 REGRESS = pg_trgm
 
diff --git a/contrib/pg_xlogdump/Makefile b/contrib/pg_xlogdump/Makefile
index ada261c4dd00111ad7d2c7bdc08244302defa3ce..30a8706948c1ce6f8f57d284fbb92ff28a4ff909 100644
--- a/contrib/pg_xlogdump/Makefile
+++ b/contrib/pg_xlogdump/Makefile
@@ -1,6 +1,6 @@
 # contrib/pg_xlogdump/Makefile
 
-PGFILEDESC = "pg_xlogdump"
+PGFILEDESC = "pg_xlogdump - decode and display WAL"
 PGAPPICON=win32
 
 PROGRAM = pg_xlogdump
diff --git a/contrib/pgbench/Makefile b/contrib/pgbench/Makefile
index b8f5fb467f67d6c1d87fea0d7a8c7ab3e694d6b8..b8e2fc841ec38b252e0a65cc41a55207ce5284c2 100644
--- a/contrib/pgbench/Makefile
+++ b/contrib/pgbench/Makefile
@@ -4,7 +4,7 @@ PGFILEDESC = "pgbench - a simple program for running benchmark tests"
 PGAPPICON = win32
 
 PROGRAM = pgbench
-OBJS	= pgbench.o
+OBJS	= pgbench.o $(WIN32RES)
 
 PG_CPPFLAGS = -I$(libpq_srcdir)
 PG_LIBS = $(libpq_pgport) $(PTHREAD_LIBS)
diff --git a/contrib/pgcrypto/Makefile b/contrib/pgcrypto/Makefile
index 1c85c982ff94374a8a33571ca94a58574765d227..05716c99fe39862dab9fae43bc74ce031b17c461 100644
--- a/contrib/pgcrypto/Makefile
+++ b/contrib/pgcrypto/Makefile
@@ -23,10 +23,11 @@ SRCS		= pgcrypto.c px.c px-hmac.c px-crypt.c \
 		pgp-pgsql.c
 
 MODULE_big	= pgcrypto
-OBJS		= $(SRCS:.c=.o)
+OBJS		= $(SRCS:.c=.o) $(WIN32RES)
 
 EXTENSION = pgcrypto
 DATA = pgcrypto--1.1.sql pgcrypto--1.0--1.1.sql pgcrypto--unpackaged--1.0.sql
+PGFILEDESC = "pgcrypto - cryptographic functions"
 
 REGRESS = init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael \
 	$(CF_TESTS) \
diff --git a/contrib/pgrowlocks/Makefile b/contrib/pgrowlocks/Makefile
index fe8042344f675dd4abc1fee834c2064ab7cfb577..059ea0528b7b3d21b2829ac9b2ab2a6510cadfa4 100644
--- a/contrib/pgrowlocks/Makefile
+++ b/contrib/pgrowlocks/Makefile
@@ -1,10 +1,11 @@
 # contrib/pgrowlocks/Makefile
 
 MODULE_big	= pgrowlocks
-OBJS		= pgrowlocks.o
+OBJS		= pgrowlocks.o $(WIN32RES)
 
 EXTENSION = pgrowlocks
 DATA = pgrowlocks--1.1.sql pgrowlocks--1.0--1.1.sql pgrowlocks--unpackaged--1.0.sql
+PGFILEDESC = "pgrowlocks - display row locking information"
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/pgstattuple/Makefile b/contrib/pgstattuple/Makefile
index d991c3a803993b2af59dafe70ecd6498df988c06..862585cc01740f378f276c577b20dfad8f939780 100644
--- a/contrib/pgstattuple/Makefile
+++ b/contrib/pgstattuple/Makefile
@@ -1,10 +1,11 @@
 # contrib/pgstattuple/Makefile
 
 MODULE_big	= pgstattuple
-OBJS		= pgstattuple.o pgstatindex.o
+OBJS		= pgstattuple.o pgstatindex.o $(WIN32RES)
 
 EXTENSION = pgstattuple
 DATA = pgstattuple--1.2.sql pgstattuple--1.1--1.2.sql pgstattuple--1.0--1.1.sql pgstattuple--unpackaged--1.0.sql
+PGFILEDESC = "pgstattuple - tuple-level statistics"
 
 REGRESS = pgstattuple
 
diff --git a/contrib/postgres_fdw/Makefile b/contrib/postgres_fdw/Makefile
index 8c497201d0e7705e39fc0028cf62d8a771dc659c..7c660955cafba61f93c2de419740cc124eb247b5 100644
--- a/contrib/postgres_fdw/Makefile
+++ b/contrib/postgres_fdw/Makefile
@@ -1,7 +1,8 @@
 # contrib/postgres_fdw/Makefile
 
 MODULE_big = postgres_fdw
-OBJS = postgres_fdw.o option.o deparse.o connection.o
+OBJS = postgres_fdw.o option.o deparse.o connection.o $(WIN32RES)
+PGFILEDESC = "postgres_fdw - foreign data wrapper for PostgreSQL"
 
 PG_CPPFLAGS = -I$(libpq_srcdir)
 SHLIB_LINK = $(libpq)
diff --git a/contrib/seg/Makefile b/contrib/seg/Makefile
index fb9c5765c34e4ceda4af0ea2194262ac680595fb..d6de8a24449bbbdcc3d53aa6380e8323a5c439ec 100644
--- a/contrib/seg/Makefile
+++ b/contrib/seg/Makefile
@@ -1,10 +1,11 @@
 # contrib/seg/Makefile
 
 MODULE_big = seg
-OBJS = seg.o segparse.o
+OBJS = seg.o segparse.o $(WIN32RES)
 
 EXTENSION = seg
 DATA = seg--1.0.sql seg--unpackaged--1.0.sql
+PGFILEDESC = "seg - line segment data type"
 
 REGRESS = seg
 
diff --git a/contrib/sepgsql/Makefile b/contrib/sepgsql/Makefile
index ff3a61da25b336cbd8aa14c340df68ec10d3a443..f194b7ed8a4f53e5229bbbc3713ee3f201c5a353 100644
--- a/contrib/sepgsql/Makefile
+++ b/contrib/sepgsql/Makefile
@@ -2,8 +2,9 @@
 
 MODULE_big = sepgsql
 OBJS = hooks.o selinux.o uavc.o label.o dml.o \
-	database.o schema.o relation.o proc.o
+	database.o schema.o relation.o proc.o $(WIN32RES)
 DATA_built = sepgsql.sql
+PGFILEDESC = "sepgsql - SELinux integration"
 
 # Note: because we don't tell the Makefile there are any regression tests,
 # we have to clean those result files explicitly
diff --git a/contrib/spi/Makefile b/contrib/spi/Makefile
index 0c11bfcbbd47b0c3ed002874bfefd9e2022cf5ac..10ab5bb5fefeebd002853bcbd04b4cbfc598d130 100644
--- a/contrib/spi/Makefile
+++ b/contrib/spi/Makefile
@@ -9,6 +9,7 @@ DATA = autoinc--1.0.sql autoinc--unpackaged--1.0.sql \
        moddatetime--1.0.sql moddatetime--unpackaged--1.0.sql \
        refint--1.0.sql refint--unpackaged--1.0.sql \
        timetravel--1.0.sql timetravel--unpackaged--1.0.sql
+PGFILEDESC = "spi - examples of using SPI and triggers"
 
 DOCS = $(addsuffix .example, $(MODULES))
 
diff --git a/contrib/sslinfo/Makefile b/contrib/sslinfo/Makefile
index 0dee6ed2f76524793a0f901aaf9fbbc8174ff4db..86cbf053e6b6a5105076479dd1fb5de4c018ec8e 100644
--- a/contrib/sslinfo/Makefile
+++ b/contrib/sslinfo/Makefile
@@ -1,10 +1,11 @@
 # contrib/sslinfo/Makefile
 
 MODULE_big = sslinfo
-OBJS = sslinfo.o
+OBJS = sslinfo.o $(WIN32RES)
 
 EXTENSION = sslinfo
 DATA = sslinfo--1.0.sql sslinfo--unpackaged--1.0.sql
+PGFILEDESC = "sslinfo - information about client SSL certificate"
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/tablefunc/Makefile b/contrib/tablefunc/Makefile
index eb108931ec49a8a8473708ea94a0ecda6a6c8407..7150117640d288cf6317f36d7432f994f58d7a3c 100644
--- a/contrib/tablefunc/Makefile
+++ b/contrib/tablefunc/Makefile
@@ -4,6 +4,7 @@ MODULES = tablefunc
 
 EXTENSION = tablefunc
 DATA = tablefunc--1.0.sql tablefunc--unpackaged--1.0.sql
+PGFILEDESC = "tablefunc - various functions that return tables"
 
 REGRESS = tablefunc
 
diff --git a/contrib/tcn/Makefile b/contrib/tcn/Makefile
index 7bac5e359c2bbc33f17d36a534818da681f0aca0..2de3425bbda90f65a06adeb61dcbf41d34c2bfc0 100644
--- a/contrib/tcn/Makefile
+++ b/contrib/tcn/Makefile
@@ -4,6 +4,7 @@ MODULES = tcn
 
 EXTENSION = tcn
 DATA = tcn--1.0.sql
+PGFILEDESC = "tcn - trigger function notifying listeners"
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/test_decoding/Makefile b/contrib/test_decoding/Makefile
index daf4e60c39d44a67fdea7d87fc606e97bb0d62aa..d7f32c3ec58c365496b67d21ec1b7238b9c5ee96 100644
--- a/contrib/test_decoding/Makefile
+++ b/contrib/test_decoding/Makefile
@@ -1,6 +1,7 @@
 # contrib/test_decoding/Makefile
 
 MODULES = test_decoding
+PGFILEDESC = "test_decoding - example of a logical decoding output plugin"
 
 # Note: because we don't tell the Makefile there are any regression tests,
 # we have to clean those result files explicitly
diff --git a/contrib/test_parser/Makefile b/contrib/test_parser/Makefile
index b9766cb0234dc1692031e7b81786b75d6919f780..7e068abd3e6a417aa2fcc21ea73defbd4527a8f0 100644
--- a/contrib/test_parser/Makefile
+++ b/contrib/test_parser/Makefile
@@ -1,7 +1,8 @@
 # contrib/test_parser/Makefile
 
 MODULE_big = test_parser
-OBJS = test_parser.o
+OBJS = test_parser.o $(WIN32RES)
+PGFILEDESC = "test_parser - example of a custom parser for full-text search"
 
 EXTENSION = test_parser
 DATA = test_parser--1.0.sql test_parser--unpackaged--1.0.sql
diff --git a/contrib/test_shm_mq/Makefile b/contrib/test_shm_mq/Makefile
index 5e5ac1ceb816f2172e49fdb28680b42a307a5d18..e3c405442c5391698b788b053fddb70416f1174e 100644
--- a/contrib/test_shm_mq/Makefile
+++ b/contrib/test_shm_mq/Makefile
@@ -1,7 +1,8 @@
 # contrib/test_shm_mq/Makefile
 
 MODULE_big = test_shm_mq
-OBJS = test.o setup.o worker.o
+OBJS = test.o setup.o worker.o $(WIN32RES)
+PGFILEDESC = "test_shm_mq - example use of shared memory message queue"
 
 EXTENSION = test_shm_mq
 DATA = test_shm_mq--1.0.sql
diff --git a/contrib/tsearch2/Makefile b/contrib/tsearch2/Makefile
index d260fd00309d62da2b90dc6ee9daaea7f2ad8095..36dcedc688e34cd0504cc9c40115793ef5b785c0 100644
--- a/contrib/tsearch2/Makefile
+++ b/contrib/tsearch2/Makefile
@@ -4,6 +4,7 @@ MODULES = tsearch2
 
 EXTENSION = tsearch2
 DATA = tsearch2--1.0.sql tsearch2--unpackaged--1.0.sql
+PGFILEDESC = "tsearch2 - backward-compatible text search functionality"
 
 REGRESS = tsearch2
 
diff --git a/contrib/unaccent/Makefile b/contrib/unaccent/Makefile
index f0be62db53fa362aade17e424ef8fc47b77bf6ea..bc93e6f8dd2ff0d67245521d2a40a872e49f2839 100644
--- a/contrib/unaccent/Makefile
+++ b/contrib/unaccent/Makefile
@@ -1,11 +1,12 @@
 # contrib/unaccent/Makefile
 
 MODULE_big = unaccent
-OBJS = unaccent.o
+OBJS = unaccent.o $(WIN32RES)
 
 EXTENSION = unaccent
 DATA = unaccent--1.0.sql unaccent--unpackaged--1.0.sql
 DATA_TSEARCH = unaccent.rules
+PGFILEDESC = "unaccent - text search dictionary that removes accents"
 
 REGRESS = unaccent
 
diff --git a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
index 335cc7ef50a8e9d2fedf9bb434ce0cb5fd1e133f..93b9355a0caf19736dd9d2eef311e2bbf013b168 100644
--- a/contrib/uuid-ossp/Makefile
+++ b/contrib/uuid-ossp/Makefile
@@ -1,10 +1,11 @@
 # contrib/uuid-ossp/Makefile
 
 MODULE_big = uuid-ossp
-OBJS = uuid-ossp.o $(UUID_EXTRA_OBJS)
+OBJS = uuid-ossp.o $(UUID_EXTRA_OBJS) $(WIN32RES)
 
 EXTENSION = uuid-ossp
 DATA = uuid-ossp--1.0.sql uuid-ossp--unpackaged--1.0.sql
+PGFILEDESC = "uuid-ossp - UUID generation"
 
 REGRESS = uuid_ossp
 
diff --git a/contrib/vacuumlo/Makefile b/contrib/vacuumlo/Makefile
index b658f9bf6f850d71dee78d178cb0fcd0bee986f0..b4ba896fba93b378ea791e0d80a38910d134fd85 100644
--- a/contrib/vacuumlo/Makefile
+++ b/contrib/vacuumlo/Makefile
@@ -4,7 +4,7 @@ PGFILEDESC = "vacuumlo - removes orphaned large objects"
 PGAPPICON = win32
 
 PROGRAM = vacuumlo
-OBJS	= vacuumlo.o
+OBJS	= vacuumlo.o $(WIN32RES)
 
 PG_CPPFLAGS = -I$(libpq_srcdir)
 PG_LIBS = $(libpq_pgport)
diff --git a/contrib/worker_spi/Makefile b/contrib/worker_spi/Makefile
index fbb29b4f2fe40d34334800817d0b2e781243c768..5cce4d1ef9e68c20e64ed118c11edd95d523f5b7 100644
--- a/contrib/worker_spi/Makefile
+++ b/contrib/worker_spi/Makefile
@@ -4,6 +4,7 @@ MODULES = worker_spi
 
 EXTENSION = worker_spi
 DATA = worker_spi--1.0.sql
+PGFILEDESC = "worker_spi - background worker example"
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/xml2/Makefile b/contrib/xml2/Makefile
index be3d018cf535abaf13a38a09483442c654dfe496..2f7a08cff1a7ae3dafbab9e07e456fdb740ffe15 100644
--- a/contrib/xml2/Makefile
+++ b/contrib/xml2/Makefile
@@ -1,10 +1,11 @@
 # contrib/xml2/Makefile
 
 MODULE_big = pgxml
-OBJS = xpath.o xslt_proc.o
+OBJS = xpath.o xslt_proc.o $(WIN32RES)
 
 EXTENSION = xml2
 DATA = xml2--1.0.sql xml2--unpackaged--1.0.sql
+PGFILEDESC = "xml2 - XPath querying and XSLT"
 
 REGRESS = xml2
 
diff --git a/src/backend/replication/libpqwalreceiver/Makefile b/src/backend/replication/libpqwalreceiver/Makefile
index 774adaa24d400b94ca2ab344c20ba8eabbf47a65..6c95c1ce97b611da6f55d276675fad83e13fd413 100644
--- a/src/backend/replication/libpqwalreceiver/Makefile
+++ b/src/backend/replication/libpqwalreceiver/Makefile
@@ -14,9 +14,10 @@ include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
 
-OBJS = libpqwalreceiver.o
+OBJS = libpqwalreceiver.o $(WIN32RES)
 SHLIB_LINK = $(libpq)
 SHLIB_PREREQS = submake-libpq
+PGFILEDESC = "libpqwalreceiver - receive WAL during streaming replication"
 NAME = libpqwalreceiver
 
 all: all-shared-lib
diff --git a/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile b/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile
index d71ca16c000a38518e99dae1018037a33093dfae..fa65eba9fd7c3a793847d5d60d9a326d573fd3ac 100644
--- a/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile
+++ b/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= ascii_and_mic
+PGFILEDESC	= "ascii <-> mic text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile b/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile
index 78c384a6b6827a3d9bd0feed43d4a5313d4d7ce9..e7cd8e8162a3d4b7ce755e44ed24389a18784695 100644
--- a/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile
+++ b/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= cyrillic_and_mic
+PGFILEDESC	= "cyrillic <-> mic text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile b/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile
index 199e65525a0447dcaccd3dfe58a05ff596e24509..fe0221cc34b395e405ce3960e569c566861cb29f 100644
--- a/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile
+++ b/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= euc2004_sjis2004
+PGFILEDESC	= "euc2004 <-> sjis2004 text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile b/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile
index a7406564291f547214ee28d0a67de0c2775df8c2..cb6a83f5841e911010d1e85996aba3127a6b8d49 100644
--- a/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile
+++ b/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= euc_cn_and_mic
+PGFILEDESC	= "euc_cn <-> mic text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile b/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile
index fa167e98afd1706a5a9bbff35b94b30e9cac41e3..0b1de0e48dcd95e5ead94887a843cfd11f8450b9 100644
--- a/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile
+++ b/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= euc_jp_and_sjis
+PGFILEDESC	= "euc_jp <-> sjis text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile b/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile
index 5ce5548dc34d60c4f522f52989cc0bd9537ed831..d43b082bd5fa3b4012578defc6adfbaa98e9af48 100644
--- a/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile
+++ b/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= euc_kr_and_mic
+PGFILEDESC	= "euc_kr <-> mic text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile
index 762543543422b0d8aae0aab1f3b530a73a521746..5ac238908da113acd14a9e4b8acbd63219f525a6 100644
--- a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile
+++ b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile
@@ -8,6 +8,7 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= euc_tw_and_big5
+PGFILEDESC	= "euc_tw <-> big5 text conversions"
 
 SRCS += big5.c
 OBJS += big5.o
diff --git a/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile b/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile
index 7587b66cad4d0d931f6f71551d8e4e141ba7aa40..5e48dae2e8a920316c0b212b18b96eac26dec14a 100644
--- a/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile
+++ b/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= latin2_and_win1250
+PGFILEDESC	= "latin2 <-> win1250 text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile b/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile
index ec887406b9bd52dbf87606ae75dd6d613fecb599..c404738d2f64761af2de1eeac30dfbf7dddb3d65 100644
--- a/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile
+++ b/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= latin_and_mic
+PGFILEDESC	= "latin <-> mic text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/proc.mk b/src/backend/utils/mb/conversion_procs/proc.mk
index 77322a452ef2e809617338c1a1468d390022d9c9..e0a3b74b25efa0e7c748cb7109f6145197138838 100644
--- a/src/backend/utils/mb/conversion_procs/proc.mk
+++ b/src/backend/utils/mb/conversion_procs/proc.mk
@@ -1,5 +1,5 @@
 SRCS		+= $(NAME).c
-OBJS		+= $(NAME).o
+OBJS		+= $(NAME).o $(WIN32RES)
 
 rpath =
 
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile
index a4b1b3ff5d0950ac4e3d657d844fe512875bdfa7..7bd68e209b731d9d863d0a8a07f2c45d2add9baf 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= utf8_and_ascii
+PGFILEDESC	= "utf8 <-> ascii text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile
index df728369a7ab46e1e9e5d73ab489bf3767dbf529..2c274f3d9ccabc5be335e4bbda25658eac800365 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= utf8_and_big5
+PGFILEDESC	= "utf8 <-> big5 text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile
index 410037c37847d07b7d5eb6c19a144505c0f4507f..725281ec9671821c7b64c448ffe735fafab356e8 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= utf8_and_cyrillic
+PGFILEDESC	= "utf8 <-> cyrillic text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile
index 58c513a2246591f77928d99c659392b9beeebe54..c6c537cffc80343a04fa685b174b9fff1766a733 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= utf8_and_euc2004
+PGFILEDESC	= "utf8 <-> euc2004 text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile
index 053162e245fa0d9fb3ec420f1d4b553b35707761..9d0e157a758dc628228cd2a3f0732d24f78f09fa 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= utf8_and_euc_cn
+PGFILEDESC	= "utf8 <-> euc_cn text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile
index 6a7678d0ec86027008a4a708ec95e1ba506b2f5b..c5f557843639a4132fd2fb01d09135378278343b 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= utf8_and_euc_jp
+PGFILEDESC	= "utf8 <-> euc_jp text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile
index 13935abaf7bd8fcf6c9917f179461a73c74d6363..a7eff9e9e17441f311fcc9c5f2562ed44b603cd2 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= utf8_and_euc_kr
+PGFILEDESC	= "utf8 <-> euc_kr text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile
index 7b9b833dc6eae2a6bd92279d47348cefb6b614e5..59f42dc2b7d712a95df66bdfd179b03eb7dd8eb9 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= utf8_and_euc_tw
+PGFILEDESC	= "utf8 <-> euc_tw text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile
index 1fb3e5a67a1e9fe59593866433f27bc87edf18d0..17bc18c373bca7e0a2fc6c57fa723c20795f5af5 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= utf8_and_gb18030
+PGFILEDESC	= "utf8 <-> gb18030 text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile
index 240fe1458dc3dd4413efb0e9c24c88f6cc72e5db..eb20638440fb70dd8ffcccdddd869b59de321119 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= utf8_and_gbk
+PGFILEDESC	= "utf8 <-> gbk text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile
index c02323e8d823fb9369d9596abf776605df088429..6fd0dd27bf529106ee56feefae34849af6f4968d 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= utf8_and_iso8859
+PGFILEDESC	= "utf8 <-> iso8859 text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile
index c2fac2eda8f9b1f6879a36cf7cd9ef0a4876fedf..02982847c5d03e1f6f4f0e6e5654bebdbee3235d 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= utf8_and_iso8859_1
+PGFILEDESC	= "utf8 <-> iso8859_1 text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile
index bdd39fb5420fc18f0bce6baa63ded9c61969b422..e48ef3e3ea7a856adc31844d8e191e90d508f67c 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= utf8_and_johab
+PGFILEDESC	= "utf8 <-> johab text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile
index 7f4dd0c67fd6c6b2bdec4d275c2a5fd10e2fab75..448c5d4b64a067f3080dc09a9debcb091b82a000 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= utf8_and_sjis
+PGFILEDESC	= "utf8 <-> sjis text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile
index ed0bfde801d62dbb37fa59e73017c0ef07f2d0b0..f7072a4dc5fe1f71e99fd6a2f78115db861a7897 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= utf8_and_sjis2004
+PGFILEDESC	= "utf8 <-> sjis2004 text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile
index 5c09c7e6f640fbe5731de149aefaac219ea28e8a..cc6e0a9c971322b1306ac76bfc8bacae68555824 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= utf8_and_uhc
+PGFILEDESC	= "utf8 <-> uhc text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile
index 31c510bab7857f6e996e2d8abe7e4418746a9dc6..d8b18fbf3345117b1be298c50c2f79d376cff23a 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile
@@ -8,5 +8,6 @@ top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		= utf8_and_win
+PGFILEDESC	= "utf8 <-> win text conversions"
 
 include $(srcdir)/../proc.mk
diff --git a/src/bin/pg_basebackup/Makefile b/src/bin/pg_basebackup/Makefile
index c6322ec26d4b6fa10074b31e7be1fab09ab5b9fa..90d19e77f3f0c734b6cd83caf8d5b3c8a60d9eb9 100644
--- a/src/bin/pg_basebackup/Makefile
+++ b/src/bin/pg_basebackup/Makefile
@@ -9,7 +9,7 @@
 #
 #-------------------------------------------------------------------------
 
-PGFILEDESC = "pg_basebackup - takes a streaming base backup of a PostgreSQL instance"
+PGFILEDESC = "pg_basebackup/pg_receivexlog/pg_recvlogical - streaming WAL and backup receivers"
 PGAPPICON=win32
 
 subdir = src/bin/pg_basebackup
diff --git a/src/interfaces/ecpg/compatlib/Makefile b/src/interfaces/ecpg/compatlib/Makefile
index db704d7de19b8a5ec857aa743e3cff7ec573092e..1e2d69887066ea97d1320cca3f293469884ccbb7 100644
--- a/src/interfaces/ecpg/compatlib/Makefile
+++ b/src/interfaces/ecpg/compatlib/Makefile
@@ -13,6 +13,7 @@ subdir = src/interfaces/ecpg/compatlib
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
+PGFILEDESC = "ECPG compat - compatibility library for ECPG"
 NAME= ecpg_compat
 SO_MAJOR_VERSION= 3
 SO_MINOR_VERSION= 7
@@ -30,7 +31,7 @@ SHLIB_EXPORTS = exports.txt
 # Need to recompile any libpgport object files
 LIBS := $(filter-out -lpgport, $(LIBS))
 
-OBJS= informix.o $(filter snprintf.o, $(LIBOBJS))
+OBJS= informix.o $(filter snprintf.o, $(LIBOBJS)) $(WIN32RES)
 
 PKG_CONFIG_REQUIRES_PRIVATE = libecpg libpgtypes
 
diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile
index 9f4582e229139975e575f99f2350d0329fa5f9c1..c99faac42e4099662ebf2f23b1a726ba95d107c1 100644
--- a/src/interfaces/ecpg/ecpglib/Makefile
+++ b/src/interfaces/ecpg/ecpglib/Makefile
@@ -13,6 +13,7 @@ subdir = src/interfaces/ecpg/ecpglib
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
+PGFILEDESC = "ECPG - embedded SQL in C"
 NAME= ecpg
 SO_MAJOR_VERSION= 6
 SO_MINOR_VERSION= 7
@@ -26,7 +27,7 @@ LIBS := $(filter-out -lpgport, $(LIBS))
 
 OBJS= execute.o typename.o descriptor.o sqlda.o data.o error.o prepare.o memory.o \
 	connect.o misc.o path.o pgstrcasecmp.o \
-	$(filter snprintf.o strlcpy.o win32setlocale.o isinf.o, $(LIBOBJS))
+	$(filter snprintf.o strlcpy.o win32setlocale.o isinf.o, $(LIBOBJS)) $(WIN32RES)
 
 # thread.c is needed only for non-WIN32 implementation of path.c
 ifneq ($(PORTNAME), win32)
diff --git a/src/interfaces/ecpg/pgtypeslib/Makefile b/src/interfaces/ecpg/pgtypeslib/Makefile
index d73c37efd296fa5a8a495ef10253febdda3d0de0..436855e9843b3b4b2ea11d1a1fccee58f966c577 100644
--- a/src/interfaces/ecpg/pgtypeslib/Makefile
+++ b/src/interfaces/ecpg/pgtypeslib/Makefile
@@ -13,6 +13,7 @@ subdir = src/interfaces/ecpg/pgtypeslib
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
+PGFILEDESC = "pgtypes - library for data type mapping"
 NAME= pgtypes
 SO_MAJOR_VERSION= 3
 SO_MINOR_VERSION= 6
@@ -30,7 +31,7 @@ SHLIB_EXPORTS = exports.txt
 
 OBJS= numeric.o datetime.o common.o dt_common.o timestamp.o interval.o \
 	pgstrcasecmp.o \
-	$(filter rint.o snprintf.o, $(LIBOBJS))
+	$(filter rint.o snprintf.o, $(LIBOBJS)) $(WIN32RES)
 
 all: all-lib
 
diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile
index d359fce7b5c3057f084f803e10fafdaaee0c2415..56f6a17c34e38e0d22c3c63c328d3fc678334308 100644
--- a/src/interfaces/ecpg/test/Makefile
+++ b/src/interfaces/ecpg/test/Makefile
@@ -13,6 +13,8 @@ override CPPFLAGS := \
 	'-DDLSUFFIX="$(DLSUFFIX)"' \
 	$(CPPFLAGS)
 
+PGFILEDESC = "ECPG Test - regression tests for ECPG"
+
 # where to find psql for testing an existing installation
 PSQLDIR = $(bindir)
 
@@ -41,13 +43,13 @@ clean distclean maintainer-clean:
 	$(MAKE) -C compat_informix $@
 	$(MAKE) -C thread $@
 	rm -rf tmp_check results log
-	rm -f pg_regress regression.diffs regression.out pg_regress_ecpg.o
+	rm -f pg_regress regression.diffs regression.out pg_regress_ecpg.o $(WIN32RES)
 
 # Build regression test driver
 
 all: pg_regress$(X)
 
-pg_regress$(X): pg_regress_ecpg.o $(top_builddir)/src/test/regress/pg_regress.o
+pg_regress$(X): pg_regress_ecpg.o $(WIN32RES) $(top_builddir)/src/test/regress/pg_regress.o
 	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) $^ $(LIBS) -o $@
 
 $(top_builddir)/src/test/regress/pg_regress.o:
diff --git a/src/makefiles/Makefile.win32 b/src/makefiles/Makefile.win32
index 9cb84f2502b4edcd7adfb2c6df661f52db7cfe87..73f0767229ecf5bc9be9f65b16f850040ece00fd 100644
--- a/src/makefiles/Makefile.win32
+++ b/src/makefiles/Makefile.win32
@@ -75,5 +75,5 @@ win32ver.o: win32ver.rc
 	$(WINDRES) -i $< -o $@ --include-dir=$(top_builddir)/src/include --include-dir=$(srcdir)
 
 # Rule for building a shared library from a single .o file
-%.dll: %.o
-	$(CC) $(CFLAGS) -shared -o $@ $< -Wl,--export-all-symbols $(LDFLAGS) $(LDFLAGS_SL) $(BE_DLLLIBS)
+%.dll: %.o $(WIN32RES)
+	$(CC) $(CFLAGS) -shared -o $@ $^ -Wl,--export-all-symbols $(LDFLAGS) $(LDFLAGS_SL) $(BE_DLLLIBS)
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index 8cf229e23cdb7d020cf287e5e7fa8e0cff656382..cc69c1be50ff17c70d8be3c86bb1434a8a308dcf 100644
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -224,7 +224,7 @@ endif # MODULE_big
 
 clean:
 ifdef MODULES
-	rm -f $(addsuffix $(DLSUFFIX), $(MODULES)) $(addsuffix .o, $(MODULES))
+	rm -f $(addsuffix $(DLSUFFIX), $(MODULES)) $(addsuffix .o, $(MODULES)) $(WIN32RES)
 endif
 ifdef DATA_built
 	rm -f $(DATA_built)
diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index 1e800a344c834a0fa24554305a70febb1204ad44..a04a2d3456d1d8bf735c7daea79e1404928feb30 100644
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -26,10 +26,11 @@ override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) -I$(perl_archlibexp)/CORE
 
 rpathdir = $(perl_archlibexp)/CORE
 
+PGFILEDESC = "PL/Perl - procedural language"
 
 NAME = plperl
 
-OBJS = plperl.o SPI.o Util.o
+OBJS = plperl.o SPI.o Util.o $(WIN32RES)
 
 DATA = plperl.control plperl--1.0.sql plperl--unpackaged--1.0.sql \
        plperlu.control plperlu--1.0.sql plperlu--unpackaged--1.0.sql
diff --git a/src/pl/plpgsql/src/Makefile b/src/pl/plpgsql/src/Makefile
index 852b0c7ae4928d1e12e85d5b43cd228839014af8..e073b2abd0acd358fc33cf2e4fbe364d5db3cd14 100644
--- a/src/pl/plpgsql/src/Makefile
+++ b/src/pl/plpgsql/src/Makefile
@@ -10,6 +10,8 @@ subdir = src/pl/plpgsql/src
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
+PGFILEDESC = "PL/pgSQL - procedural language"
+
 # Shared library parameters
 NAME= plpgsql
 
@@ -17,7 +19,8 @@ override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
 SHLIB_LINK = $(filter -lintl, $(LIBS))
 rpath =
 
-OBJS = pl_gram.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o pl_scanner.o
+OBJS = pl_gram.o pl_handler.o pl_comp.o pl_exec.o \
+	pl_funcs.o pl_scanner.o $(WIN32RES)
 
 DATA = plpgsql.control plpgsql--1.0.sql plpgsql--unpackaged--1.0.sql
 
diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile
index 020861a4f8bed75bcdeb0683ef113c558be66a0e..9c0fc613f9a861410952f4b4f118ccd33dd008da 100644
--- a/src/pl/plpython/Makefile
+++ b/src/pl/plpython/Makefile
@@ -38,6 +38,8 @@ override CPPFLAGS := -I. -I$(srcdir) $(python_includespec) $(CPPFLAGS)
 
 rpathdir = $(python_libdir)
 
+PGFILEDESC = "PL/Python - procedural language"
+
 NAME = plpython$(python_majorversion)
 
 OBJS = \
@@ -52,7 +54,8 @@ OBJS = \
 	plpy_spi.o \
 	plpy_subxactobject.o \
 	plpy_typeio.o \
-	plpy_util.o
+	plpy_util.o \
+	$(WIN32RES)
 
 DATA = $(NAME)u.control $(NAME)u--1.0.sql $(NAME)u--unpackaged--1.0.sql
 ifeq ($(python_majorversion),2)
diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile
index 2ab2a2791bb20d130126531fe4f8b5c185c6c95c..7ea00267c0309225eb5fa27316fe311e6845021a 100644
--- a/src/pl/tcl/Makefile
+++ b/src/pl/tcl/Makefile
@@ -34,10 +34,11 @@ ifneq ($(PORTNAME), win32)
 SHLIB_LINK = $(TCL_LIB_SPEC) $(TCL_LIBS) -lc
 endif
 
+PGFILEDESC = "PL/Tcl - procedural language"
 
 NAME = pltcl
 
-OBJS = pltcl.o
+OBJS = pltcl.o $(WIN32RES)
 
 DATA = pltcl.control pltcl--1.0.sql pltcl--unpackaged--1.0.sql \
        pltclu.control pltclu--1.0.sql pltclu--unpackaged--1.0.sql
diff --git a/src/tools/msvc/clean.bat b/src/tools/msvc/clean.bat
index 4671f30e50c4eaba8e139c8abf6d7d0120dd6670..b76eea99eda0f460afe6df33797a862d314b46a0 100755
--- a/src/tools/msvc/clean.bat
+++ b/src/tools/msvc/clean.bat
@@ -19,6 +19,12 @@ if exist pgsql.suo del /q /a:H pgsql.suo
 del /s /q src\bin\win32ver.rc 2> NUL
 del /s /q src\interfaces\win32ver.rc 2> NUL
 if exist src\backend\win32ver.rc del /q src\backend\win32ver.rc
+if exist src\backend\replication\libpqwalreceiver\win32ver.rc del /q src\backend\replication\libpqwalreceiver\win32ver.rc
+if exist src\pl\plperl\win32ver.rc del /q src\pl\plperl\win32ver.rc
+if exist src\pl\plpgsql\src\win32ver.rc del /q src\pl\plpgsql\src\win32ver.rc
+if exist src\pl\plpython\win32ver.rc del /q src\pl\plpython\win32ver.rc
+if exist src\pl\tcl\win32ver.rc del /q src\pl\tcl\win32ver.rc
+for /d %%f in (src\interfaces\ecpg\*) do if exist %%f\win32ver.rc del /q %%f\win32ver.rc
 for /d %%f in (contrib\*) do if exist %%f\win32ver.rc del /q %%f\win32ver.rc
 for /d %%f in (src\backend\utils\mb\conversion_procs\*) do if exist %%f\win32ver.rc del /q %%f\win32ver.rc