diff --git a/ChangeLog b/ChangeLog
index 6c632cc3..b246a510 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,7 +33,9 @@ xx/xx/2005 - 1.12.0-WIP
 	  ntfs_mft_record_alloc.  (Yura)
 	- Make ntfsmount use new APIs for file and directory creation/deletion.
 	  Implement utime operation.  (Yura)
-	- Hard link mkfs.ntfs and mkfs.ntfs.8 with mkntfs and mkntfs.8  (Szaka).
+	- Hard link mkfs.ntfs and mkfs.ntfs.8 with mkntfs and mkntfs.8.  (Szaka)
+	- Only include sys/ioctl.h in libntfs/device.c if ./configure detected
+	  it to be present.  (Christophe)
 
 08/08/2005 - 1.11.2 - ntfsdecrypt now works and lots of fixes and improvements.
 
diff --git a/libntfs/device.c b/libntfs/device.c
index 2e95bb77..6439b942 100644
--- a/libntfs/device.c
+++ b/libntfs/device.c
@@ -29,7 +29,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <sys/ioctl.h>
+#ifdef HAVE_SYS_IOCTL_H
+#	include <sys/ioctl.h>
+#endif
 #ifdef HAVE_LINUX_FD_H
 #	include <linux/fd.h>
 #endif