diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 95549af6..1736971d 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -9,6 +9,10 @@
     format strings, and to avoid warnings generated by such compilers:
     print.c:111: warning: format not a string literal and no format arguments
 
+  * configure.ac: Put our local -I paths into CPPFLAGS before anything coming
+    from the user as we want to make sure our local paths take precedence.
+    Reported by Steve Franks from a FreeBSD report.
+
 2009-02-11  Arnim Laeuger  <arniml@users.sourceforge.net>
 
   * src/bsdl/bsdl_sem.c: return proper error code to upper level
diff --git a/jtag/configure.ac b/jtag/configure.ac
index c72bb146..e4873797 100644
--- a/jtag/configure.ac
+++ b/jtag/configure.ac
@@ -265,7 +265,7 @@ AS_IF([test "x$with_inpout32" = xyes], [
 
 
 CFLAGS="$CFLAGS -Wall"
-CPPFLAGS="$CPPFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/include"
+CPPFLAGS="-I\$(top_srcdir) -I\$(top_srcdir)/include $CPPFLAGS"
 
 
 # check for lex/flex