diff --git a/docs/License.rst b/docs/License.rst
index 3cac49d..d2adea9 100644
--- a/docs/License.rst
+++ b/docs/License.rst
@@ -1,12 +1,41 @@
 License
 =======
 
-|Creative Commons License|
+- The OpenZFS software is licensed under the Common Development and Distribution License
+  (`CDDL <https://opensource.org/licenses/CDDL-1.0>`__) unless otherwise noted.
 
-Documentation content is licensed under a `Creative Commons
-Attribution-ShareAlike
-license <http://creativecommons.org/licenses/by-sa/3.0/>`__ unless
-otherwise noted.
+- The OpenZFS documentation content is licensed under a Creative Commons Attribution-ShareAlike
+  license (`CC BY-SA 3.0 <http://creativecommons.org/licenses/by-sa/3.0/>`__)
+  unless otherwise noted.
+
+- OpenZFS is an associated project of SPI (`Software in the Public Interest
+  <https://www.spi-inc.org/projects/openzfs/>`__). SPI is a 501(c)(3) nonprofit
+  organization which handles the donations, finances, and legal holdings of the project.
+
+.. note::
+   The Linux Kernel is licensed under the GNU General Public License
+   Version 2 (`GPLv2 <http://www.gnu.org/licenses/gpl2.html>`__). While
+   both (OpenZFS and Linux Kernel) are free open source licenses they are
+   restrictive licenses. The combination of them causes problems because it
+   prevents using pieces of code exclusively available under one license
+   with pieces of code exclusively available under the other in the same binary.
+   In the case of the Linux Kernel, this prevents us from distributing OpenZFS
+   as part of the Linux Kernel binary. However, there is nothing in either license
+   that prevents distributing it in the form of a binary module or in the form
+   of source code.
+   
+   Additional reading and opinions:
+
+   -  `Software Freedom Law
+      Center <https://www.softwarefreedom.org/resources/2016/linux-kernel-cddl.html>`__
+   -  `Software Freedom
+      Conservancy <https://sfconservancy.org/blog/2016/feb/25/zfs-and-linux/>`__
+   -  `Free Software
+      Foundation <https://www.fsf.org/licensing/zfs-and-linux>`__
+   -  `Encouraging closed source
+      modules <http://www.networkworld.com/article/2301697/smb/encouraging-closed-source-modules-part-1--copyright-and-software.html>`__
+
+CC BY-SA 3.0: |Creative Commons License|
 
 .. |Creative Commons License| image:: https://i.creativecommons.org/l/by-sa/3.0/88x31.png
    :target: http://creativecommons.org/licenses/by-sa/3.0/
diff --git a/docs/Project and Community/FAQ.rst b/docs/Project and Community/FAQ.rst
index 7d13a75..3898f22 100644
--- a/docs/Project and Community/FAQ.rst	
+++ b/docs/Project and Community/FAQ.rst	
@@ -629,29 +629,7 @@ the following contents:
 Licensing
 ---------
 
-ZFS is licensed under the Common Development and Distribution License
-(`CDDL <http://hub.opensolaris.org/bin/view/Main/opensolaris_license>`__),
-and the Linux kernel is licensed under the GNU General Public License
-Version 2 (`GPLv2 <http://www.gnu.org/licenses/gpl2.html>`__). While
-both are free open source licenses they are restrictive licenses. The
-combination of them causes problems because it prevents using pieces of
-code exclusively available under one license with pieces of code
-exclusively available under the other in the same binary. In the case of
-the kernel, this prevents us from distributing ZFS on Linux as part of
-the kernel binary. However, there is nothing in either license that
-prevents distributing it in the form of a binary module or in the form
-of source code.
-
-Additional reading and opinions:
-
--  `Software Freedom Law
-   Center <https://www.softwarefreedom.org/resources/2016/linux-kernel-cddl.html>`__
--  `Software Freedom
-   Conservancy <https://sfconservancy.org/blog/2016/feb/25/zfs-and-linux/>`__
--  `Free Software
-   Foundation <https://www.fsf.org/licensing/zfs-and-linux>`__
--  `Encouraging closed source
-   modules <http://www.networkworld.com/article/2301697/smb/encouraging-closed-source-modules-part-1--copyright-and-software.html>`__
+License information can be found `here <https://openzfs.github.io/openzfs-docs/License.html>`__.
 
 Reporting a problem
 -------------------