diff --git a/TeXmacs/progs/doc/help-menu.scm b/TeXmacs/progs/doc/help-menu.scm
index 013786c5f6..4eba8342fb 100644
--- a/TeXmacs/progs/doc/help-menu.scm
+++ b/TeXmacs/progs/doc/help-menu.scm
@@ -22,12 +22,43 @@
   (or (url-exists-in-help? (string-append name ".en.tmu"))
       (url-exists-in-help? (string-append name ".en.tm"))))
 
-(tm-menu (help-plugins-menu)
-  (for (name (list-filter (map symbol->string (plugin-list))
-                          plugin-documented?))
-    (with menu-name `(verbatim ,(session-name name))
-      ((eval menu-name)
-       (load-local-plugin-doc name)))))
+(tm-menu (help-configuration-menu)
+  ("User preferences"
+   (load-local-doc "configuration/conf.userpref"))
+  ("Keyboard configuration"
+   (load-local-doc "configuration/conf.keyconfig"))
+  ("Users of Cyrillic languages"
+   (load-local-doc "configuration/conf.cyrillicuser"))
+  ("Users of oriental languages"
+   (load-local-doc "configuration/conf.eastuser")))
+
+(tm-menu (help-manual-menu)
+  ("Getting started"
+   (load-local-doc "manual/manu.gettingstarted"))
+  ("Typing simple texts"
+   (load-local-doc "manual/manu.typing"))
+  ("Mathematical formulas"
+   (load-local-doc "manual/manu.formulas"))
+  ("Tabular material"
+   (load-local-doc "manual/manu.tables"))
+  ("Automatic content generation"
+   (load-local-doc "manual/manu.toc"))
+  ("Creating technical pictures"
+   (load-local-doc "manual/manu.tables")) 
+  ("Advanced layout features"
+   (load-local-doc "manual/manu.layout"))
+  ("Editing tools"
+   (load-local-doc "manual/manu.editing"))
+  ("Laptop presentations"
+   (load-local-doc "manual/manu.slides"))
+  ("TeXmacs as an interface"
+   (load-local-doc "manual/manu.interface"))
+  ("Writing your own style files"
+   (load-local-doc "manual/manu.styles"))
+  ("Customizing TeXmacs"
+   (load-local-doc "manual/manu.custom"))
+  ("The TeXmacs plug-in system"
+   (load-local-doc "manual/manu.plugin")))
 
 (tm-menu (help-configuration-menu)
   ("User preferences"
diff --git a/xmake.lua b/xmake.lua
index 2b667c675c..f01e7c6955 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -199,8 +199,8 @@ end
 
 add_requires("libjpeg")
 if is_plat("linux") then
-    add_requires("apt::libpng-dev", {alias="libpng"})
-    add_requires("apt::libcurl4-openssl-dev", {alias="libcurl"})
+    add_requires("libpng", {alias="libpng"})
+    add_requires("libcurl", {alias="libcurl"})
 end
 
 add_requires("liii-pdfhummus", {system=false,configs={libpng=true,libjpeg=true}})
@@ -209,7 +209,7 @@ if using_legacy_apt() then
     add_requireconfs("liii-pdfhummus.freetype", {version = FREETYPE_VERSION, system = false, override=true})
 else
     if is_plat("linux") then
-        add_requires("apt::libfreetype-dev", {alias="freetype"})
+        add_requires("freetype", {alias="libfreetype"})
     else
         add_requires("freetype "..FREETYPE_VERSION, {system=false, configs={png=true}})
     end