diff --git a/doc/de/autogen/debug_commands.xml b/doc/de/autogen/debug_commands.xml
deleted file mode 100644
index 77ee10e3d..000000000
--- a/doc/de/autogen/debug_commands.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     ********* WARNING! *********
-
-     This file is autogenerated with docgen.pl script. *** DO NOT EDIT! ***
-     docgen.pl builds XML doc files to include in many languages
--->
-
-<command>debug  dump | buffer | windows | text</command>
-<programlisting>
-Debugging-Nachricht ausgeben
-
-   dump: save memory dump in WeeChat log file (same dump is written when WeeChat crashes)
- buffer: dump buffer content with hexadecimal values in log file
-windows: display windows tree
-   text: send "debug" signal with "text" as argument
-</programlisting>
diff --git a/doc/de/autogen/weechat_commands.xml b/doc/de/autogen/weechat_commands.xml
index bd68ec6f3..da6cae7b9 100644
--- a/doc/de/autogen/weechat_commands.xml
+++ b/doc/de/autogen/weechat_commands.xml
@@ -86,6 +86,17 @@ launch explicit WeeChat or plugin command
  plugin: plugin name ('weechat' for WeeChat internal command)
 command: command to execute (a '/' is automatically added if not found at beginning of command)
 </programlisting>
+<command>debug  [list | plugin level | dump | buffer | windows]</command>
+<programlisting>
+control debug for core/plugins
+
+ plugin: name of plugin ("core" for WeeChat core)
+  level: debug level for plugin (0 = disable debug)
+   dump: save memory dump in WeeChat log file (same dump is written when WeeChat crashes)
+ buffer: dump buffer content with hexadecimal values in log file
+windows: display windows tree
+   text: send "debug" signal with "text" as argument
+</programlisting>
 <command>filter  [list] | [enable|disable|toggle [name]] | [add name buffer tags regex] | [del name|-all]</command>
 <programlisting>
 filter messages in buffers, to hide/show them according to tags or regex
diff --git a/doc/de/autogen/weechat_options.xml b/doc/de/autogen/weechat_options.xml
index 5394f1155..a2f810466 100644
--- a/doc/de/autogen/weechat_options.xml
+++ b/doc/de/autogen/weechat_options.xml
@@ -1222,6 +1222,22 @@
   </listitem>
 </itemizedlist>
 
+<command>weechat.debug.irc</command>
+<itemizedlist>
+  <listitem>
+    <para>description: niveau de debug pour l'extension ("core" pour le coeur de WeeChat)</para>
+  </listitem>
+  <listitem>
+    <para>type: integer</para>
+  </listitem>
+  <listitem>
+    <para>values: 0 .. 32</para>
+  </listitem>
+  <listitem>
+    <para>default value: 0</para>
+  </listitem>
+</itemizedlist>
+
 <command>weechat.history.display_default</command>
 <itemizedlist>
   <listitem>
diff --git a/doc/docgen.pl b/doc/docgen.pl
index 680c544b4..66b3fef2c 100644
--- a/doc/docgen.pl
+++ b/doc/docgen.pl
@@ -64,12 +64,12 @@ my @locale_list = qw(en_US fr_FR de_DE);
 # Note: we consider core is a plugin called "weechat"
 my %plugin_list = ("weechat" => "co", "alias"   => "",
                    "aspell"  => "o",  "charset" => "c",
-                   "debug"   => "co", "demo"    => "co",
-                   "fifo"    => "co", "irc"     => "co",
-                   "logger"  => "co", "notify"  => "co",
-                   "perl"    => "",   "python"  => "",
-                   "ruby"    => "",   "lua"     => "",
-                   "tcl"     => "",   "xfer"    => "co");
+                   "demo"    => "co", "fifo"    => "co",
+                   "irc"     => "co", "logger"  => "co",
+                   "notify"  => "co", "perl"    => "",
+                   "python"  => "",   "ruby"    => "",
+                   "lua"     => "",   "tcl"     => "",
+                   "xfer"    => "co");
 
 # options to ignore
 my @ignore_options = ("weechat\\.bar\\..*",
diff --git a/doc/en/autogen/debug_commands.xml b/doc/en/autogen/debug_commands.xml
deleted file mode 100644
index b8fe102d7..000000000
--- a/doc/en/autogen/debug_commands.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     ********* WARNING! *********
-
-     This file is autogenerated with docgen.pl script. *** DO NOT EDIT! ***
-     docgen.pl builds XML doc files to include in many languages
--->
-
-<command>debug  dump | buffer | windows | text</command>
-<programlisting>
-print debug messages
-
-   dump: save memory dump in WeeChat log file (same dump is written when WeeChat crashes)
- buffer: dump buffer content with hexadecimal values in log file
-windows: display windows tree
-   text: send "debug" signal with "text" as argument
-</programlisting>
diff --git a/doc/en/autogen/weechat_commands.xml b/doc/en/autogen/weechat_commands.xml
index 06d197f2f..3b2c91e50 100644
--- a/doc/en/autogen/weechat_commands.xml
+++ b/doc/en/autogen/weechat_commands.xml
@@ -86,6 +86,17 @@ launch explicit WeeChat or plugin command
  plugin: plugin name ('weechat' for WeeChat internal command)
 command: command to execute (a '/' is automatically added if not found at beginning of command)
 </programlisting>
+<command>debug  [list | plugin level | dump | buffer | windows]</command>
+<programlisting>
+control debug for core/plugins
+
+ plugin: name of plugin ("core" for WeeChat core)
+  level: debug level for plugin (0 = disable debug)
+   dump: save memory dump in WeeChat log file (same dump is written when WeeChat crashes)
+ buffer: dump buffer content with hexadecimal values in log file
+windows: display windows tree
+   text: send "debug" signal with "text" as argument
+</programlisting>
 <command>filter  [list] | [enable|disable|toggle [name]] | [add name buffer tags regex] | [del name|-all]</command>
 <programlisting>
 filter messages in buffers, to hide/show them according to tags or regex
diff --git a/doc/en/autogen/weechat_options.xml b/doc/en/autogen/weechat_options.xml
index 1e5017806..da4ac433d 100644
--- a/doc/en/autogen/weechat_options.xml
+++ b/doc/en/autogen/weechat_options.xml
@@ -1222,6 +1222,22 @@
   </listitem>
 </itemizedlist>
 
+<command>weechat.debug.irc</command>
+<itemizedlist>
+  <listitem>
+    <para>description: niveau de debug pour l'extension ("core" pour le coeur de WeeChat)</para>
+  </listitem>
+  <listitem>
+    <para>type: integer</para>
+  </listitem>
+  <listitem>
+    <para>values: 0 .. 32</para>
+  </listitem>
+  <listitem>
+    <para>default value: 0</para>
+  </listitem>
+</itemizedlist>
+
 <command>weechat.history.display_default</command>
 <itemizedlist>
   <listitem>
diff --git a/doc/fr/autogen/debug_commands.xml b/doc/fr/autogen/debug_commands.xml
deleted file mode 100644
index a7426c692..000000000
--- a/doc/fr/autogen/debug_commands.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     ********* WARNING! *********
-
-     This file is autogenerated with docgen.pl script. *** DO NOT EDIT! ***
-     docgen.pl builds XML doc files to include in many languages
--->
-
-<command>debug  dump | buffer | windows | texte</command>
-<programlisting>
-affiche des messages de debogage
-
-   dump: affiche les variables mémoire WeeChat dans le fichier log (les mêmes messages sont affichés lorsque WeeChat plante)
- buffer: affiche le contenu du tampon en valeurs hexadécimales dans le fichier log
-windows: affiche l'arbre des fenêtres&lt;
-  texte: envoie le signal "debug" avec "texte" comme paramètre
-</programlisting>
diff --git a/doc/fr/autogen/weechat_commands.xml b/doc/fr/autogen/weechat_commands.xml
index e237586cd..c532f6299 100644
--- a/doc/fr/autogen/weechat_commands.xml
+++ b/doc/fr/autogen/weechat_commands.xml
@@ -84,6 +84,17 @@ lancer explicitement une commande WeeChat ou d'une extension
 extension: nom de l'extension ('weechat' pour une commande interne WeeChat)
  commande: commande à exécuter (un '/' est automatiquement ajouté s'il n'est pas trouvé au début de la commande)
 </programlisting>
+<command>debug  [list | extension niveau | dump | buffer windows]</command>
+<programlisting>
+contrôle du debug pour le coeur/les extensions
+
+extension: nom de l'extension ("core" pour le coeur de WeeChat)
+   niveau: niveau de debug pour l'extension
+     dump: affiche les variables mémoire WeeChat dans le fichier log (les mêmes messages sont affichés lorsque WeeChat plante)
+   buffer: affiche le contenu du tampon en valeurs hexadécimales dans le fichier log
+  windows: affiche l'arbre des fenêtres&lt;
+    texte: envoie le signal "debug" avec "texte" comme paramètre
+</programlisting>
 <command>filter  [list] | [enable|disable|toggle [nom]] | [add nom buffer tags regex] | [del nom|-all]</command>
 <programlisting>
 filtre les messages dans les tampons, pour les cacher/afficher selon des tags ou expressions régulières
diff --git a/doc/fr/autogen/weechat_infos.xml b/doc/fr/autogen/weechat_infos.xml
index d86108a56..3066da142 100644
--- a/doc/fr/autogen/weechat_infos.xml
+++ b/doc/fr/autogen/weechat_infos.xml
@@ -99,7 +99,7 @@
 <row>
   <entry>infolist</entry>
   <entry>plugin</entry>
-  <entry>list of plugins</entry>
+  <entry>liste des extensions</entry>
 </row>
 <row>
   <entry>infolist</entry>
diff --git a/doc/fr/autogen/weechat_options.xml b/doc/fr/autogen/weechat_options.xml
index 733091ce5..bc668758a 100644
--- a/doc/fr/autogen/weechat_options.xml
+++ b/doc/fr/autogen/weechat_options.xml
@@ -1222,6 +1222,22 @@
   </listitem>
 </itemizedlist>
 
+<command>weechat.debug.irc</command>
+<itemizedlist>
+  <listitem>
+    <para>description: niveau de debug pour l'extension ("core" pour le coeur de WeeChat)</para>
+  </listitem>
+  <listitem>
+    <para>type: entier</para>
+  </listitem>
+  <listitem>
+    <para>valeurs: 0 .. 32</para>
+  </listitem>
+  <listitem>
+    <para>valeur par défaut: 0</para>
+  </listitem>
+</itemizedlist>
+
 <command>weechat.history.display_default</command>
 <itemizedlist>
   <listitem>
diff --git a/doc/include_autogen.xml b/doc/include_autogen.xml
index 67c757d15..a9bead4b2 100644
--- a/doc/include_autogen.xml
+++ b/doc/include_autogen.xml
@@ -3,7 +3,6 @@
 <!ENTITY alias_commands.xml SYSTEM "autogen/alias_commands.xml">
 <!ENTITY aspell_commands.xml SYSTEM "autogen/aspell_commands.xml">
 <!ENTITY charset_commands.xml SYSTEM "autogen/charset_commands.xml">
-<!ENTITY debug_commands.xml SYSTEM "autogen/debug_commands.xml">
 <!ENTITY demo_commands.xml SYSTEM "autogen/demo_commands.xml">
 <!ENTITY irc_commands.xml SYSTEM "autogen/irc_commands.xml">
 <!ENTITY logger_commands.xml SYSTEM "autogen/logger_commands.xml">