diff --git a/src/bin/pg_config/win32.mak b/src/bin/pg_config/win32.mak
new file mode 100644
index 0000000000000000000000000000000000000000..c3a8965f5ee9852a50751338b291c9e2537b73e0
--- /dev/null
+++ b/src/bin/pg_config/win32.mak
@@ -0,0 +1,99 @@
+# Makefile for Microsoft Visual C++ 5.0 (or compat)
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+
+!IFDEF DEBUG
+OPT=/Od /Zi /MDd
+LOPT=/DEBUG
+DEBUGDEF=/D _DEBUG
+OUTDIR=.\Debug
+INTDIR=.\Debug
+!ELSE
+OPT=/O2 /MD
+LOPT=
+DEBUGDEF=/D NDEBUG
+OUTDIR=.\Release
+INTDIR=.\Release
+!ENDIF
+
+ALL : "..\..\port\pg_config_paths.h" "$(OUTDIR)\pg_config.exe"
+
+CLEAN :
+	-@erase "$(INTDIR)\pg_config.obj"
+	-@erase "$(OUTDIR)\pg_config.exe"
+	-@erase "$(INTDIR)\..\..\port\pg_config_paths.h"
+
+"..\..\port\pg_config_paths.h": win32.mak
+	echo #define PGBINDIR "" >$@
+	echo #define PGSHAREDIR "" >>$@
+	echo #define SYSCONFDIR "" >>$@
+	echo #define INCLUDEDIR "" >>$@
+	echo #define PKGINCLUDEDIR "" >>$@
+	echo #define INCLUDEDIRSERVER "" >>$@
+	echo #define LIBDIR "" >>$@
+	echo #define PKGLIBDIR "" >>$@
+	echo #define LOCALEDIR "" >>$@
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo $(OPT) /W3 /GX /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\
+ "_MBCS" /Fp"$(INTDIR)\pg_config.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
+ /I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32 \
+ /D "HAVE_STRDUP" /D "FRONTEND" /D VAL_CONFIGURE="\"\""
+
+CPP_OBJS=$(INTDIR)/
+CPP_SBRS=.
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
+ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
+ odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\
+ /pdb:"$(OUTDIR)\pg_config.pdb" /machine:I386 $(LOPT) /out:"$(OUTDIR)\pg_config.exe" 
+LINK32_OBJS= \
+	"$(INTDIR)\pg_config.obj" \
+	"$(INTDIR)\pgstrcasecmp.obj" \
+	"$(OUTDIR)\path.obj" \
+	"$(INTDIR)\exec.obj" \
+!IFDEF DEBUG
+	"..\..\interfaces\libpq\Debug\libpqddll.lib"
+!ELSE
+	"..\..\interfaces\libpq\Release\libpqdll.lib"
+!ENDIF
+
+"$(OUTDIR)\pg_config.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+"$(OUTDIR)\path.obj" : "$(OUTDIR)" ..\..\port\path.c
+    $(CPP) @<<
+    $(CPP_PROJ) ..\..\port\path.c
+<<
+
+"$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c
+    $(CPP) @<<
+    $(CPP_PROJ) ..\..\port\pgstrcasecmp.c
+<<
+
+"$(INTDIR)\exec.obj" : ..\..\port\exec.c
+    $(CPP) @<<
+    $(CPP_PROJ) ..\..\port\exec.c
+<<
+
+.c{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
diff --git a/src/win32.mak b/src/win32.mak
index 69aef55aab40175dfd658d72292ed0406b8717c8..5a69de50a2caed427134bec6c21ac111df45dc89 100644
--- a/src/win32.mak
+++ b/src/win32.mak
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/win32.mak,v 1.9 2003/11/29 19:51:39 pgsql Exp $
+# $PostgreSQL: pgsql/src/win32.mak,v 1.10 2005/06/14 17:50:37 momjian Exp $
 
 # Makefile for Microsoft Visual C++ 5.0 (or compat)
 # Top-file makefile for Win32 parts of postgresql.
@@ -18,6 +18,8 @@ ALL:
    nmake /f win32.mak $(MAKEMACRO)
    cd ..\..\bin\psql
    nmake /f win32.mak $(MAKEMACRO)
+   cd ..\..\bin\pg_config
+   nmake /f win32.mak $(MAKEMACRO)
    cd ..\..
    echo All Win32 parts have been built!
 
@@ -26,6 +28,8 @@ CLEAN:
    nmake /f win32.mak CLEAN
    cd ..\..\bin\psql
    nmake /f win32.mak CLEAN
+   cd ..\..\bin\pg_config
+   nmake /f win32.mak CLEAN
    cd ..\..
    echo All Win32 parts have been cleaned!