diff --git a/ChangeLog b/ChangeLog
index 0d05788baad71e2c22b0841165a9212508f65d25..a68478f2087cef8a29f327db3278dc43e02607ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,8 @@ Changes in version 0.2.1.13-????? - 2009-02-??
       aligned.  Possible fix for bug 604.
     - Parse dates and IPv4 addresses in a locale- and libc-independent
       manner, to avoid platform-dependent behavior on malformed input.
+    - Build correctly when configured to build outside the main source
+      path.  Patch from Michael Gold.
 
   o Minor features:
     - On Linux, use the prctl call to re-enable core dumps when the user
@@ -50,7 +52,6 @@ Changes in version 0.2.1.13-????? - 2009-02-??
       can keep up-to-date on which relays they should be using.
     - Update to the "February 26 2009" ip-to-country file.
 
-
 Changes in version 0.2.0.34 - 2009-02-08
   Tor 0.2.0.34 features several more security-related fixes. You should
   upgrade, especially if you run an exit relay (remote crash) or a
diff --git a/configure.in b/configure.in
index 60cace0a705baa8e111ba92cbfd2ba82cf0f4309..273f8780159cabf1834e79a6f4a8001a1c268295 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ fi
 
 # Not a no-op; we want to make sure that CPPFLAGS is set before we use
 # the += operator on it in src/or/Makefile.am
-CPPFLAGS="$CPPFLAGS -I../common"
+CPPFLAGS="$CPPFLAGS -I\${top_srcdir}/src/common"
 
 AC_ARG_ENABLE(debug,
  AS_HELP_STRING(--enable-debug, compile with debugging info),