diff --git a/ospfclient/ChangeLog b/ospfclient/ChangeLog
index 08653f4..3c6b462 100644
--- a/ospfclient/ChangeLog
+++ b/ospfclient/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-20 Paul Jakma <paul@dishone.st>
+
+	* Makefile.am: Add @INCLUDES@ and srcdir to allow out-of-tree
+	  builds to work.
+
 2004-06-30  Greg Troxel  <gdt@poblano.ir.bbn.com>
 
 	* Makefile.am: Add libtool/shlib support.
diff --git a/ospfclient/Makefile.am b/ospfclient/Makefile.am
index c506846..ab2a378 100644
--- a/ospfclient/Makefile.am
+++ b/ospfclient/Makefile.am
@@ -1,6 +1,6 @@
 ## Automake.am for OSPF API client
 
-INCLUDES = -I../lib -I../
+INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib
 
 lib_LTLIBRARIES = libospfapiclient.la
 libospfapiclient_la_LDFLAGS = -version 0:0:0