diff --git a/demos/readme.txt b/demos/readme.txt
index 3530c8e4..a29ce9f6 100644
--- a/demos/readme.txt
+++ b/demos/readme.txt
@@ -2,7 +2,7 @@ This folder contains a few demos which explain how to use the library.
 
 Only the main files are contained. No compile-able projects
 
-All demos and examples stand under the BSD license as declared below and
+Most demos and examples stand under the BSD license as declared below and
 within each file:
 
 /*
@@ -34,3 +34,5 @@ within each file:
  */
 
 Files under the 3rdparty directory are licensed as per the original contributor.
+Files under the tools directory are licensed with either the uGFX license or the BSD
+license - see each tool demo source code for its specific license.
diff --git a/demos/tools/touch_driver_test/demo.mk b/demos/tools/touch_driver_test/demo.mk
new file mode 100644
index 00000000..3af3fbda
--- /dev/null
+++ b/demos/tools/touch_driver_test/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/tools/touch_driver_test
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c
diff --git a/tools/touch_driver_test/gfxconf.h b/demos/tools/touch_driver_test/gfxconf.h
similarity index 100%
rename from tools/touch_driver_test/gfxconf.h
rename to demos/tools/touch_driver_test/gfxconf.h
diff --git a/tools/touch_driver_test/main.c b/demos/tools/touch_driver_test/main.c
similarity index 100%
rename from tools/touch_driver_test/main.c
rename to demos/tools/touch_driver_test/main.c
diff --git a/demos/tools/touch_raw_readings/demo.mk b/demos/tools/touch_raw_readings/demo.mk
new file mode 100644
index 00000000..dbc3746e
--- /dev/null
+++ b/demos/tools/touch_raw_readings/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/tools/touch_raw_readings
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c
diff --git a/tools/touch_raw_readings/gfxconf.h b/demos/tools/touch_raw_readings/gfxconf.h
similarity index 100%
rename from tools/touch_raw_readings/gfxconf.h
rename to demos/tools/touch_raw_readings/gfxconf.h
diff --git a/tools/touch_raw_readings/main.c b/demos/tools/touch_raw_readings/main.c
similarity index 100%
rename from tools/touch_raw_readings/main.c
rename to demos/tools/touch_raw_readings/main.c
diff --git a/demos/tools/uGFXnetDisplay/demo.mk b/demos/tools/uGFXnetDisplay/demo.mk
new file mode 100644
index 00000000..e8bae51e
--- /dev/null
+++ b/demos/tools/uGFXnetDisplay/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/tools/uGFXnetDisplay
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c
diff --git a/tools/uGFXnetDisplay/gfxconf.h b/demos/tools/uGFXnetDisplay/gfxconf.h
similarity index 100%
rename from tools/uGFXnetDisplay/gfxconf.h
rename to demos/tools/uGFXnetDisplay/gfxconf.h
diff --git a/tools/uGFXnetDisplay/main.c b/demos/tools/uGFXnetDisplay/main.c
similarity index 100%
rename from tools/uGFXnetDisplay/main.c
rename to demos/tools/uGFXnetDisplay/main.c