diff --git a/src/utils/Makefile b/src/utils/Makefile
index 46ab610f11..c1f153900b 100644
--- a/src/utils/Makefile
+++ b/src/utils/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/utils/Attic/Makefile,v 1.6 1999/01/17 06:20:03 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/utils/Attic/Makefile,v 1.7 2000/02/27 01:18:46 tgl Exp $
 #
 # About strdup:  Some systems have strdup in their standard library, others
 # don't.  Ones that don't will use this make file to compile the strdup.c
@@ -13,10 +13,14 @@
 # because the strdup.c in this directory may conflict with the strdup()
 # prototype from the system library and cause a compile error.
 #
+# getopt.o is likewise built only on request.
+#
+# dllinit.o is only built on Win32 platform.
+#
 #-------------------------------------------------------------------------
 
 SRCDIR = ..
-include ../Makefile.global
+include $(SRCDIR)/Makefile.global
 
 all: version.o
 
@@ -26,10 +30,11 @@ depend dep:
 	$(CC) $(CFLAGS) -MM *.c >depend
 
 clean: 
-	rm -f version.o
-ifeq ($(PORTNAME), win)
-	rm -f dllinit.o
-endif
+	rm -f dllinit.o getopt.o strdup.o version.o
+
+# Make sure version.o has proper dependency on version.h,
+# even if we didn't do make depend.
+version.o: version.c $(SRCDIR)/include/version.h
 
 ifeq (depend,$(wildcard depend))
 include depend