diff --git a/doc/manuals/Makefile b/doc/manuals/Makefile
index 2f87b57..63bd422 100644
--- a/doc/manuals/Makefile
+++ b/doc/manuals/Makefile
@@ -4,6 +4,6 @@
 
 ASCIIDOC = icE1usb-usermanual.adoc
 include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
-icE1usb-usermanual.pdf: chapters/*.adoc
+icE1usb-usermanual.pdf: chapters/icE1usb/*.adoc
 
 include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc
diff --git a/doc/manuals/chapters/firmware.adoc b/doc/manuals/chapters/icE1usb/firmware.adoc
similarity index 100%
rename from doc/manuals/chapters/firmware.adoc
rename to doc/manuals/chapters/icE1usb/firmware.adoc
diff --git a/doc/manuals/chapters/gateware.adoc b/doc/manuals/chapters/icE1usb/gateware.adoc
similarity index 100%
rename from doc/manuals/chapters/gateware.adoc
rename to doc/manuals/chapters/icE1usb/gateware.adoc
diff --git a/doc/manuals/chapters/hardware.adoc b/doc/manuals/chapters/icE1usb/hardware.adoc
similarity index 100%
rename from doc/manuals/chapters/hardware.adoc
rename to doc/manuals/chapters/icE1usb/hardware.adoc
diff --git a/doc/manuals/chapters/host-software.adoc b/doc/manuals/chapters/icE1usb/host-software.adoc
similarity index 100%
rename from doc/manuals/chapters/host-software.adoc
rename to doc/manuals/chapters/icE1usb/host-software.adoc
diff --git a/doc/manuals/icE1usb-usermanual.adoc b/doc/manuals/icE1usb-usermanual.adoc
index 5cfeef6..6069e07 100644
--- a/doc/manuals/icE1usb-usermanual.adoc
+++ b/doc/manuals/icE1usb-usermanual.adoc
@@ -6,12 +6,12 @@
 
 include::./common/chapters/preface.adoc[]
 
-include::./chapters/hardware.adoc[]
+include::./chapters/icE1usb/hardware.adoc[]
 
-include::./chapters/gateware.adoc[]
+include::./chapters/icE1usb/gateware.adoc[]
 
-include::./chapters/firmware.adoc[]
+include::./chapters/icE1usb/firmware.adoc[]
 
-include::./chapters/host-software.adoc[]
+include::./chapters/icE1usb/host-software.adoc[]
 
 include::./common/chapters/gfdl.adoc[]