diff --git a/MAINTAINERS b/MAINTAINERS
index 873f496c63640de6ca412eba8eecbc787ab9075d..6fb6bdc2eb3ff455bfef694f0fdf780684a4a9f5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4871,6 +4871,7 @@ S:	Maintained
 F:	drivers/iio/
 F:	drivers/staging/iio/
 F:	include/linux/iio/
+F:	tools/iio/
 
 IKANOS/ADI EAGLE ADSL USB DRIVER
 M:	Matthieu Castet <castet.matthieu@free.fr>
diff --git a/tools/iio/Makefile b/tools/iio/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..83813ad379f9aa408109c160ad03d3e78c40f63a
--- /dev/null
+++ b/tools/iio/Makefile
@@ -0,0 +1,16 @@
+CC = gcc
+CFLAGS = -Wall -g
+
+all: iio_event_monitor lsiio generic_buffer
+
+iio_event_monitor: iio_event_monitor.o iio_utils.o
+
+lsiio: lsiio.o iio_utils.o
+
+generic_buffer: generic_buffer.o iio_utils.o
+
+%.o: %.c iio_utils.h
+
+.PHONY: clean
+clean:
+	rm -f *.o iio_event_monitor lsiio generic_buffer
diff --git a/drivers/staging/iio/Documentation/generic_buffer.c b/tools/iio/generic_buffer.c
similarity index 100%
rename from drivers/staging/iio/Documentation/generic_buffer.c
rename to tools/iio/generic_buffer.c
diff --git a/drivers/staging/iio/Documentation/iio_event_monitor.c b/tools/iio/iio_event_monitor.c
similarity index 100%
rename from drivers/staging/iio/Documentation/iio_event_monitor.c
rename to tools/iio/iio_event_monitor.c
diff --git a/drivers/staging/iio/Documentation/iio_utils.c b/tools/iio/iio_utils.c
similarity index 100%
rename from drivers/staging/iio/Documentation/iio_utils.c
rename to tools/iio/iio_utils.c
diff --git a/drivers/staging/iio/Documentation/iio_utils.h b/tools/iio/iio_utils.h
similarity index 100%
rename from drivers/staging/iio/Documentation/iio_utils.h
rename to tools/iio/iio_utils.h
diff --git a/drivers/staging/iio/Documentation/lsiio.c b/tools/iio/lsiio.c
similarity index 100%
rename from drivers/staging/iio/Documentation/lsiio.c
rename to tools/iio/lsiio.c