diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index 6aedd831d..531027ac6 100644
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 24 15:02:26 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* Makefile.common: Add bupdir2 to reference above the i686-pc-cygwin
+	directory.
+
 Thu Jun 22 18:28:06 2000  Christopher Faylor <cgf@cygnus.com>
 
 	* Makefile.in: Add dummy info targets.
diff --git a/winsup/Makefile.common b/winsup/Makefile.common
index c5e19f3a5..550aaddfc 100644
--- a/winsup/Makefile.common
+++ b/winsup/Makefile.common
@@ -11,8 +11,8 @@
 # This makefile requires GNU make.
 
 CFLAGS_COMMON:=-Wall -Wwrite-strings # -finline-functions
-MALLOC_DEBUG:=#-DMALLOC_DEBUG -I/cygnus/src/sourceware/winsup/dlmalloc
-MALLOC_OBJ:=#/cygnus/src/sourceware/winsup/dlmalloc/malloc.o
+MALLOC_DEBUG:=#-DMALLOC_DEBUG -I/cygnus/src/sourceware/winsup/cygwin/dlmalloc
+MALLOC_OBJ:=#/cygnus/src/sourceware/winsup/cygwin/dlmalloc/malloc.o
 
 override srcdir:=${shell cd $(srcdir); pwd}
 ifneq (,${filter-out /%,$(srcdir)})
@@ -31,6 +31,7 @@ pwd:=${shell pwd}
 ifneq (,${filter-out /%,$(pwd)})
     bupdir:=..
     bupdir1:=../..
+    bupdir2:=../../..
 else
     bupdir:=${patsubst %:::,%,${patsubst %/:::,%,$(dir $(pwd)):::}}
 ifneq (,${findstring /,$(bupdir)})
@@ -38,6 +39,11 @@ ifneq (,${findstring /,$(bupdir)})
 else
     bupdir1:=$(bupdir)/..
 endif
+ifneq (,${findstring /,$(bupdir1)})
+    bupdir2:=${patsubst %:::,%,${patsubst %/:::,%,$(dir $(bupdir1)):::}}
+else
+    bupdir2:=$(bupdir1)/..
+endif
 endif
 
 w32api_source:=$(updir)/w32api