diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 11044cfa..1dc0d1c7 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,5 +1,7 @@
 2007-12-18  Kolja Waschk <kawk
 
+	* configure.ac, src/tap/parport/*.c: include stropts.h only if
+	  it's available (needed for uClinux and others; thanks Hartley)
     * doc/UrJTAG.txt, src/jtag.txt: Cosmetics, Copyright
     * src/tap/Makefile.am: include cable driver for USB Blaster and
       FT2232-based cables if any of libftdi or ftd2xx is present
diff --git a/jtag/src/tap/parport/ftd2xx.c b/jtag/src/tap/parport/ftd2xx.c
index 87afaccb..779a79f4 100644
--- a/jtag/src/tap/parport/ftd2xx.c
+++ b/jtag/src/tap/parport/ftd2xx.c
@@ -34,9 +34,11 @@
 #if __CYGWIN__
 #include <windows.h>
 #else
-#include <stropts.h>
 #include <linux/ioctl.h>
 #endif
+#ifdef HAVE_STROPTS_H
+#include <stropts.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/jtag/src/tap/parport/ftdi.c b/jtag/src/tap/parport/ftdi.c
index 2766f40f..386f263c 100644
--- a/jtag/src/tap/parport/ftdi.c
+++ b/jtag/src/tap/parport/ftdi.c
@@ -29,7 +29,9 @@
 #ifdef HAVE_LIBFTDI
 
 #include <fcntl.h>
+#ifdef HAVE_STROPTS_H
 #include <stropts.h>
+#endif
 #include <unistd.h>
 #include <linux/ioctl.h>
 
diff --git a/jtag/src/tap/parport/ppdev.c b/jtag/src/tap/parport/ppdev.c
index 88d16def..6df2dfef 100644
--- a/jtag/src/tap/parport/ppdev.c
+++ b/jtag/src/tap/parport/ppdev.c
@@ -28,7 +28,9 @@
 #ifdef HAVE_LINUX_PPDEV_H
 
 #include <fcntl.h>
+#ifdef HAVE_STROPTS_H
 #include <stropts.h>
+#endif
 #include <unistd.h>
 #include <linux/ppdev.h>
 #include <linux/ioctl.h>
diff --git a/jtag/src/tap/parport/xpcu_common.c b/jtag/src/tap/parport/xpcu_common.c
index 27edc424..f410257f 100644
--- a/jtag/src/tap/parport/xpcu_common.c
+++ b/jtag/src/tap/parport/xpcu_common.c
@@ -32,7 +32,9 @@
 #include <linux/ioctl.h>
 #include <stdio.h>
 #include <string.h>
+#ifdef HAVE_STROPTS_H
 #include <stropts.h>
+#endif
 #include <stdlib.h>
 #include <stdint.h>
 #include <unistd.h>
diff --git a/jtag/src/tap/parport/xpcu_pp.c b/jtag/src/tap/parport/xpcu_pp.c
index 44383c22..9513cc50 100644
--- a/jtag/src/tap/parport/xpcu_pp.c
+++ b/jtag/src/tap/parport/xpcu_pp.c
@@ -32,7 +32,9 @@
 #include <linux/ioctl.h>
 #include <stdio.h>
 #include <string.h>
+#ifdef HAVE_STROPTS_H
 #include <stropts.h>
+#endif
 #include <stdlib.h>
 #include <stdint.h>
 #include <unistd.h>