diff --git a/ChangeLog b/ChangeLog
index 3d4dbc2d87150571d9dd9ad49b5cc35344da99de..dfe37669041e6222405f4e5af2bb474ad84325ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,8 @@ CVS code -
 	  manual pages were written for, consistent in the
 	  documentation.  Changes to AUTHORS, nano.1, nanorc.5, and
 	  rnano.1. (DLR, based on suggestions by Jordi)
+	- Don't include sys/ioctl.h in nano.c when NANO_TINY is defined,
+	  as ioctl() is never used then. (DLR)
 - browser.c:
   do_browser()
 	- Refactor the mouse support, modeling it after do_mouse() for
diff --git a/src/nano.c b/src/nano.c
index 5d6216758a79857a43a03411d46eaca5610c50b2..785315e03b24bdc4b32b33765afd30cedb49df12 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -29,7 +29,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
-#include <sys/ioctl.h>
 #include <errno.h>
 #include <ctype.h>
 #include <locale.h>
@@ -39,6 +38,10 @@
 #include <getopt.h>
 #endif
 
+#ifndef NANO_TINY
+#include <sys/ioctl.h>
+#endif
+
 #ifdef ENABLE_NANORC
 static bool no_rcfiles = FALSE;
 	/* Should we ignore all rcfiles? */