diff --git a/trinity-base/blinken/blinken-9999.ebuild b/trinity-base/blinken/blinken-9999.ebuild
index 305359e6..b639e9f8 100644
--- a/trinity-base/blinken/blinken-9999.ebuild
+++ b/trinity-base/blinken/blinken-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdeedu"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="libtdeedu translations"
 TRINITY_NEED_ARTS="optional"
 inherit trinity-meta-2
diff --git a/trinity-base/kalzium/kalzium-9999.ebuild b/trinity-base/kalzium/kalzium-9999.ebuild
index 49606784..80cd39e7 100644
--- a/trinity-base/kalzium/kalzium-9999.ebuild
+++ b/trinity-base/kalzium/kalzium-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdeedu"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="libtdeedu translations"
 inherit trinity-meta-2
 
diff --git a/trinity-base/kanagram/kanagram-9999.ebuild b/trinity-base/kanagram/kanagram-9999.ebuild
index bb32c709..6b7b7ea9 100644
--- a/trinity-base/kanagram/kanagram-9999.ebuild
+++ b/trinity-base/kanagram/kanagram-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdeedu"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="translations"
 TRINITY_NEED_ARTS="optional"
 inherit trinity-meta-2
diff --git a/trinity-base/kbruch/kbruch-9999.ebuild b/trinity-base/kbruch/kbruch-9999.ebuild
index 8c1f86cd..1309c9a8 100644
--- a/trinity-base/kbruch/kbruch-9999.ebuild
+++ b/trinity-base/kbruch/kbruch-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdeedu"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="translations"
 TRINITY_NEED_ARTS="optional"
 inherit trinity-meta-2
diff --git a/trinity-base/keduca/keduca-9999.ebuild b/trinity-base/keduca/keduca-9999.ebuild
index 9f80c1b4..16fc87ed 100644
--- a/trinity-base/keduca/keduca-9999.ebuild
+++ b/trinity-base/keduca/keduca-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdeedu"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="translations"
 TRINITY_NEED_ARTS="optional"
 inherit trinity-meta-2
diff --git a/trinity-base/kgeography/kgeography-9999.ebuild b/trinity-base/kgeography/kgeography-9999.ebuild
index 25771c24..981c8c8a 100644
--- a/trinity-base/kgeography/kgeography-9999.ebuild
+++ b/trinity-base/kgeography/kgeography-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdeedu"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="translations"
 TRINITY_NEED_ARTS="optional"
 inherit trinity-meta-2
diff --git a/trinity-base/khangman/khangman-9999.ebuild b/trinity-base/khangman/khangman-9999.ebuild
index e925a8e9..64a1dda3 100644
--- a/trinity-base/khangman/khangman-9999.ebuild
+++ b/trinity-base/khangman/khangman-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdeedu"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="libtdeedu translations"
 TRINITY_NEED_ARTS="optional"
 inherit trinity-meta-2
diff --git a/trinity-base/kig/kig-9999.ebuild b/trinity-base/kig/kig-9999.ebuild
index 82db86e5..706aaa03 100644
--- a/trinity-base/kig/kig-9999.ebuild
+++ b/trinity-base/kig/kig-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdeedu"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="translations"
 inherit trinity-meta-2
 
diff --git a/trinity-base/kiten/kiten-9999.ebuild b/trinity-base/kiten/kiten-9999.ebuild
index 3a9d23fe..cbc4e43c 100644
--- a/trinity-base/kiten/kiten-9999.ebuild
+++ b/trinity-base/kiten/kiten-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdeedu"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="translations"
 inherit trinity-meta-2
 
diff --git a/trinity-base/klatin/klatin-9999.ebuild b/trinity-base/klatin/klatin-9999.ebuild
index 0685fe89..83f49e9c 100644
--- a/trinity-base/klatin/klatin-9999.ebuild
+++ b/trinity-base/klatin/klatin-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdeedu"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="libtdeedu translations"
 inherit trinity-meta-2
 
diff --git a/trinity-base/klettres/klettres-9999.ebuild b/trinity-base/klettres/klettres-9999.ebuild
index adf412dd..f80a582f 100644
--- a/trinity-base/klettres/klettres-9999.ebuild
+++ b/trinity-base/klettres/klettres-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdeedu"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="translations"
 inherit trinity-meta-2
 
diff --git a/trinity-base/kmplot/kmplot-9999.ebuild b/trinity-base/kmplot/kmplot-9999.ebuild
index 935654dc..e578fb94 100644
--- a/trinity-base/kmplot/kmplot-9999.ebuild
+++ b/trinity-base/kmplot/kmplot-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdeedu"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="translations"
 inherit trinity-meta-2
 
diff --git a/trinity-base/kpercentage/kpercentage-9999.ebuild b/trinity-base/kpercentage/kpercentage-9999.ebuild
index ca72dbfb..d6a7d748 100644
--- a/trinity-base/kpercentage/kpercentage-9999.ebuild
+++ b/trinity-base/kpercentage/kpercentage-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdeedu"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="translations"
 inherit trinity-meta-2
 
diff --git a/trinity-base/kstars/kstars-9999.ebuild b/trinity-base/kstars/kstars-9999.ebuild
index cd06525c..bab663d5 100644
--- a/trinity-base/kstars/kstars-9999.ebuild
+++ b/trinity-base/kstars/kstars-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdeedu"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="libtdeedu translations"
 inherit trinity-meta-2
 
diff --git a/trinity-base/ktouch/ktouch-9999.ebuild b/trinity-base/ktouch/ktouch-9999.ebuild
index af140f3a..50631091 100644
--- a/trinity-base/ktouch/ktouch-9999.ebuild
+++ b/trinity-base/ktouch/ktouch-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdeedu"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="libtdeedu translations"
 inherit trinity-meta-2
 
diff --git a/trinity-base/kturtle/kturtle-9999.ebuild b/trinity-base/kturtle/kturtle-9999.ebuild
index 99415d85..742116b9 100644
--- a/trinity-base/kturtle/kturtle-9999.ebuild
+++ b/trinity-base/kturtle/kturtle-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdeedu"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="translations"
 inherit trinity-meta-2
 
diff --git a/trinity-base/kverbos/kverbos-9999.ebuild b/trinity-base/kverbos/kverbos-9999.ebuild
index 8366ad79..1a4144f4 100644
--- a/trinity-base/kverbos/kverbos-9999.ebuild
+++ b/trinity-base/kverbos/kverbos-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdeedu"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="translations"
 inherit trinity-meta-2
 
diff --git a/trinity-base/kvoctrain/kvoctrain-9999.ebuild b/trinity-base/kvoctrain/kvoctrain-9999.ebuild
index be5fd989..dc00d97f 100644
--- a/trinity-base/kvoctrain/kvoctrain-9999.ebuild
+++ b/trinity-base/kvoctrain/kvoctrain-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdeedu"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="translations"
 inherit trinity-meta-2
 
diff --git a/trinity-base/kwordquiz/kwordquiz-9999.ebuild b/trinity-base/kwordquiz/kwordquiz-9999.ebuild
index 637d24ca..26dff474 100644
--- a/trinity-base/kwordquiz/kwordquiz-9999.ebuild
+++ b/trinity-base/kwordquiz/kwordquiz-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 TRINITY_MODULE_NAME="tdeedu"
 TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="optional"
 TSM_EXTRACT_ALSO="translations"
 inherit trinity-meta-2
 
diff --git a/trinity-base/tdeedu-doc/tdeedu-doc-9999.ebuild b/trinity-base/tdeedu-doc/tdeedu-doc-9999.ebuild
deleted file mode 100644
index 3e15a1e9..00000000
--- a/trinity-base/tdeedu-doc/tdeedu-doc-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 The Trinity Desktop Project
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-TRINITY_MODULE_NAME="tdeedu"
-TRINITY_MODULE_TYPE="core"
-inherit trinity-meta-2
-
-DESCRIPTION="Documentaion for tdeedu-derived packages"
-if [[ ${PV} != *9999* ]] ; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-	~trinity-base/khelpcenter-${PV}
-	app-doc/doxygen"
-
-src_prepare() {
-	sed -i -e '/add_subdirectory( applnk    )/d' \
-	-e '/add_subdirectory( libtdeedu )/d' "${S}/CMakeLists.txt" || die
-	echo 'tde_auto_add_subdirectories( )' >"${S}/doc/CMakeLists.txt" || die
-
-	# Fixing the build error of the scripting-api submodule
-	sed -i 's/BUILD_DOC AND BUILD_KIG/BUILD_DOC/' "${S}/ConfigureChecks.cmake" || die
-
-	trinity-meta-2_src_prepare
-}
diff --git a/trinity-base/tdeedu-meta/tdeedu-meta-9999.ebuild b/trinity-base/tdeedu-meta/tdeedu-meta-9999.ebuild
index 1e5c74c5..f90dfe34 100644
--- a/trinity-base/tdeedu-meta/tdeedu-meta-9999.ebuild
+++ b/trinity-base/tdeedu-meta/tdeedu-meta-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 The Trinity Desktop Project
+# Copyright 2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -32,5 +32,4 @@ RDEPEND="~trinity-base/blinken-${PV}
 	~trinity-base/kverbos-${PV}
 	~trinity-base/kvoctrain-${PV}
 	~trinity-base/kwordquiz-${PV}
-	~trinity-base/tdeedu-doc-${PV}
 "