diff --git a/README b/README
index b617cb6..b80aaaa 100644
--- a/README
+++ b/README
@@ -594,7 +594,7 @@ RSA), you can import them.
 Gnuk supports key generation, but this feature is young and should be
 considered experimental.
 
-For detail, please see doc/DEMO and doc/DEMO-2.
+For detail, please see doc/note/DEMO and doc/note/DEMO-2.
 
 Note that it make sense to preserve your keys on your computer so that
 you can import the keys (again) to (possibly another) Gnuk Token.  In
@@ -656,7 +656,7 @@ linux/Documentation/usb/usbmon.txt
 Firmware update
 ===============
 
-See doc/firmware-update.
+See doc/note/firmware-update.
 
 
 Read-only Git Repository
diff --git a/doc/DEMO b/doc/note/DEMO
similarity index 100%
rename from doc/DEMO
rename to doc/note/DEMO
diff --git a/doc/DEMO-2 b/doc/note/DEMO-2
similarity index 100%
rename from doc/DEMO-2
rename to doc/note/DEMO-2
diff --git a/doc/HACKING b/doc/note/HACKING
similarity index 100%
rename from doc/HACKING
rename to doc/note/HACKING
diff --git a/doc/NOTES b/doc/note/NOTES
similarity index 100%
rename from doc/NOTES
rename to doc/note/NOTES
diff --git a/doc/firmware-update b/doc/note/firmware-update
similarity index 100%
rename from doc/firmware-update
rename to doc/note/firmware-update
diff --git a/doc/settings-for-DnDpinentry b/doc/note/settings-for-DnDpinentry
similarity index 100%
rename from doc/settings-for-DnDpinentry
rename to doc/note/settings-for-DnDpinentry