diff --git a/docs/images/block-diagram-r9.png b/docs/images/block-diagram-r9.png
new file mode 100644
index 00000000..7f77f278
Binary files /dev/null and b/docs/images/block-diagram-r9.png differ
diff --git a/docs/images/block-diagram-r9.svg b/docs/images/block-diagram-r9.svg
new file mode 100644
index 00000000..6ae628b2
--- /dev/null
+++ b/docs/images/block-diagram-r9.svg
@@ -0,0 +1,4059 @@
+
+
diff --git a/docs/images/block-diagram.png b/docs/images/block-diagram.png
index fcce0b01..c0e1b680 100644
Binary files a/docs/images/block-diagram.png and b/docs/images/block-diagram.png differ
diff --git a/docs/images/block-diagram.svg b/docs/images/block-diagram.svg
index 614df982..536e75cb 100644
--- a/docs/images/block-diagram.svg
+++ b/docs/images/block-diagram.svg
@@ -1,22 +1,22 @@
diff --git a/docs/source/hardware_components.rst b/docs/source/hardware_components.rst
index 8c408d97..30ea303e 100644
--- a/docs/source/hardware_components.rst
+++ b/docs/source/hardware_components.rst
@@ -4,14 +4,16 @@ Hardware Components
Major parts used in HackRF One:
-* `MAX2837 2.3 to 2.7 GHz transceiver `__
- * `Datasheet `__
- * There's also a register map document that Mike received directly from Maxim. Send an email to Mike or submit a support request to Maxim if you want a copy.
-* `MAX5864 ADC/DAC `__
- * `Datasheet `__
+* `MAX2837 2.3 to 2.7 GHz transceiver `__
+ * `Datasheet `__
+* `MAX2839 2.3 to 2.7 GHz transceiver `__
+ * `Datasheet `__
+ * substitution for MAX2837.
+* `MAX5864 ADC/DAC `__
+ * `Datasheet `__
* `Si5351 clock generator `__
* `AN619: Manually Generating an Si5351 Register Map `__
- * `Datasheet `__ - this document is a mess of typos, and best used in conjunction with AN619, which has its own typos. Usually, you can reconcile what's true by comparison and a bit of thought.
+ * `Datasheet `__ - see AN619 for the complete register map.
* `Other Documentation `__ - includes application notes, user guides, and white papers.
* CoolRunner-II CPLD
* `LPC43xx ARM Cortex-M4 microcontroller `__
@@ -26,10 +28,13 @@ Major parts used in HackRF One:
* `W25Q80BV 8M-bit Flash `__
-
-
-Block Diagram
-~~~~~~~~~~~~~
+Block Diagrams
+~~~~~~~~~~~~~~
.. image:: ../images/block-diagram.png
- :align: center
+ :align: center
+
+|
+
+.. image:: ../images/block-diagram-r9.png
+ :align: center
diff --git a/docs/source/list_of_hardware_revisions.rst b/docs/source/list_of_hardware_revisions.rst
index 97e4e203..fb1aa296 100644
--- a/docs/source/list_of_hardware_revisions.rst
+++ b/docs/source/list_of_hardware_revisions.rst
@@ -15,19 +15,26 @@ This experimental revision has not been manufactured.
HackRF One r6
~~~~~~~~~~~~~
-SKY13350 RF switches were replaced by SKY13453 due to component availability. Although the SKY13453 uses simplified control logic, it did not require a firmware modification. Manufacturing year: 2020
+SKY13350 RF switches were replaced by SKY13453. Although the SKY13453 uses simplified control logic, it did not require a firmware modification. Hardware revision detection pin straps were added. Manufacturing year: 2020
HackRF One r7
~~~~~~~~~~~~~
-SKY13453 RF switches were reverted to SKY13350 due to component availability. USB VBUS detection resistor values were changed to better protect the LPC4320. Manufacturing year: 2021
+SKY13453 RF switches were reverted to SKY13350. USB VBUS detection resistor values were updated. Manufacturing year: 2021
HackRF One r8
~~~~~~~~~~~~~
-SKY13350 RF switches were replaced by SKY13453 due to component availability. Manufacturing years: 2021–2022
+SKY13350 RF switches were replaced by SKY13453. Manufacturing years: 2021–2022
+
+HackRF One r9
+~~~~~~~~~~~~~
+
+MAX2837 was replaced by MAX2839. Si5351C was replaced by Si5351A with additional clock distribution. A series diode was added to the antenna port power supply. Manufacturing year: 2023
Hardware Revision Identification
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
HackRF Ones manufactured by Great Scott Gadgets have the revision number printed on the PCB top silkscreen layer near the MAX5864 (U18).
+
+Starting with HackRF One r6, hardware revisions are detected by firmware and reported by ``hackrf_info``.
diff --git a/docs/source/software_support.rst b/docs/source/software_support.rst
index 64b53c41..c21ba9bc 100644
--- a/docs/source/software_support.rst
+++ b/docs/source/software_support.rst
@@ -52,22 +52,19 @@ HackRF Tools
In addition to third party tools that support HackRF, we provide some commandline tools for interacting with HackRF. For information on how to use each tool look at the help information provided (e.g. ``hackrf_transfer -h``) or the `manual pages `__.
-The first two tools (``hackrf_info`` and ``hackrf_transfer``) should cover most usage. The remaining tools are provided for debugging and general interest; beware, they have the potential to damage HackRF if used incorrectly.
-
* **hackrf_info** Read device information from HackRF such as serial number and firmware version.
- * **hackrf_transfer** Send and receive signals using HackRF. Input/output can be 8bit signed quadrature files or wav files.
+ * **hackrf_transfer** Send and receive signals using HackRF. Input/output files are 8-bit signed quadrature samples.
- * **hackrf_max2837** Read and write registers in the Maxim 2837 transceiver chip. For most tx/rx purposes hackrf_transfer or other tools will take care of this for you.
+ * **hackrf_sweep**, a command-line spectrum analyzer.
- * **hackrf_rffc5071** Read and write registers in the RFFC5071 mixer chip. As above, this is for curiosity or debugging only, most tools will take care of these settings automatically.
+ * **hackrf_clock** Read and write clock input and output configuration.
- * **hackrf_si5351c** Read and write registers in the Silicon Labs Si5351C clock generator chip. This should also be unnecessary for most operation.
+ * **hackrf_operacake** Configure Opera Cake antenna switch connected to HackRF.
- * **hackrf_spiflash** A tool to write new firmware to HackRF. This is mostly used for :ref:`Updating Firmware `.
-
- * **hackrf_cpldjtag** A tool to update the CPLD on HackRF. This is needed only when :ref:`Updating Firmware ` to a version prior to 2021.03.1.
+ * **hackrf_spiflash** A tool to write new firmware to HackRF. See: :ref:`Updating Firmware `.
+ * **hackrf_debug** Read and write registers and other low-level configuration for debugging.
Handling HackRF data