diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a204f08e4..c04be8c0f 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-06  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
+
+	* Makefile.in: Move srcdir definition before others which uses it.
+
 2011-04-06  Jon TURNEY  <jon.turney@dronecode.org.uk>
 
 	* dll_init.cc (reserve_at, release_at): New functions.
@@ -20,8 +24,8 @@
 
 2011-04-04  Christopher Faylor  <me.cygwin2011@cgf.cx>
 
-	* Makefile.in: Move Makefile.common include earlier to fix problems with
-	relative ${srcdir} path which confuses make.
+	* Makefile.in: Move Makefile.common include earlier to fix problems
+	with relative ${srcdir} path which confuses make.
 
 2011-04-04  Corinna Vinschen  <corinna@vinschen.de>
 
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index bb0b7336a..f29c1dd1c 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile.in for Cygwin.
 # Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Red Hat, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
 #
 # This file is part of Cygwin.
 #
@@ -15,8 +15,8 @@
 #
 CC:=@CC@
 CC_FOR_TARGET:=$(CC)
-CONFIG_DIR:=$(srcdir)/config/@CONFIG_DIR@
 srcdir:=@srcdir@
+CONFIG_DIR:=$(srcdir)/config/@CONFIG_DIR@
 include ${srcdir}/../Makefile.common
 
 SHELL:=@SHELL@