diff --git a/jtag/autogen.sh b/jtag/autogen.sh
index bb7edd0d..979937b0 100755
--- a/jtag/autogen.sh
+++ b/jtag/autogen.sh
@@ -33,7 +33,7 @@ autoconf
 
 echo
 echo "Now running ./configure script..."
-./configure --enable-maintainer-mode
+./configure --enable-maintainer-mode --with-include=/usr/local/include/openwince
 
 echo
 echo "Type \`make\` to build jtag..."
diff --git a/jtag/configure.ac b/jtag/configure.ac
index 1ca517f0..9ff886e4 100644
--- a/jtag/configure.ac
+++ b/jtag/configure.ac
@@ -44,6 +44,13 @@ AM_MAINTAINER_MODE
 AC_PROG_CC
 AC_PROG_RANLIB
 
+AC_SUBST(OPENWINCE_INC)
+AC_ARG_WITH(include,
+	AC_HELP_STRING([--with-include=PATH], [Path to the openwince includes]),
+	openwince_inc="$withval",
+	openwince_inc="/usr/include/openwince")
+OPENWINCE_INC="-I$openwince_inc -I$openwince_inc/device"
+
 AC_SEARCH_LIBS([ioperm], [ioperm])
 
 CFLAGS="$CFLAGS -Wall"
diff --git a/jtag/src/Makefile.am b/jtag/src/Makefile.am
index 4a5a4d17..c134070c 100644
--- a/jtag/src/Makefile.am
+++ b/jtag/src/Makefile.am
@@ -27,10 +27,10 @@ SUBDIRS = \
 
 bin_PROGRAMS = jtag
 
-jtag_SOURCES = jtag.c detect.c readmem.c detect.h
+jtag_SOURCES = jtag.c detect.c readmem.c detect.h pxa250.c pxa250.h
 
 jtag_DEPENDENCIES = tap/libtap.a part/libpart.a
 
 jtag_LDADD = -lreadline -lncurses -Ltap -ltap -Lpart -lpart
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include $(OPENWINCE_INC)