diff --git a/ChangeLog b/ChangeLog
index 271476f1c..49f7771fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,13 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.7-dev, 2011-10-26
+v0.3.7-dev, 2011-10-29
 
 
 Version 0.3.7 (under dev!)
 --------------------------
 
+* core: add optional arguments for command /plugin load/reload/autoload
 * core: fix compilation error with "pid_t" on Mac OS X (bug #34639)
 * core: enable background process under Cygwin to connect to servers, fix
   reconnection problem (bug #34626)
diff --git a/doc/de/autogen/user/weechat_commands.txt b/doc/de/autogen/user/weechat_commands.txt
index 03ce20676..2da7b682e 100644
--- a/doc/de/autogen/user/weechat_commands.txt
+++ b/doc/de/autogen/user/weechat_commands.txt
@@ -437,20 +437,22 @@ Beispiele:
 [command]*`plugin`* Erweiterungen verwalten (auflisten/installieren/deinstallieren)::
 ........................................
 /plugin  list|listfull [<name>]
-         load <filename>
-         autoload
-         reload|unload [<name>]
+         load <filename> [<arguments>]
+         autoload [<arguments>]
+         reload [<name> [<arguments>]]
+         unload [<name>]
 
-    list: installierte Erweiterungen werden aufgelistet
-listfull: detaillierte Auflistung aller installierten Erweiterungen
-    load: installiert eine Erweiterung
-autoload: installiert automatisch alle Erweiterungen aus dem System- oder Benutzerverzeichnis
-  reload: installiert eine Erweiterung erneut (falls kein Name angegeben wird, werden alle Erweiterungen entfernt und neu installiert)
-  unload: deinstalliere eine oder alle Erweiterungen (wird kein Name angegeben dann werden alle Erweiterung entfernt)
-filename: Erweiterung (Datei) welche installiert werden soll
-    name: Name einer Erweiterung
+     list: list loaded plugins
+ listfull: list loaded plugins (verbose)
+     load: load a plugin
+ autoload: autoload plugins in system or user directory
+   reload: reload a plugin (if no name given, unload all plugins, then autoload plugins)
+   unload: unload a plugin (if no name given, unload all plugins)
+ filename: plugin (file) to load
+     name: a plugin name
+arguments: arguments given to plugin on load
 
-Ohne Angabe eines Arguments werden alle installierten Erweiterungen angezeigt.
+Without argument, this command lists loaded plugins.
 ........................................
 
 [[command_weechat_proxy]]
diff --git a/doc/en/autogen/user/weechat_commands.txt b/doc/en/autogen/user/weechat_commands.txt
index d356583d8..053a7499f 100644
--- a/doc/en/autogen/user/weechat_commands.txt
+++ b/doc/en/autogen/user/weechat_commands.txt
@@ -437,18 +437,20 @@ Examples:
 [command]*`plugin`* list/load/unload plugins::
 ........................................
 /plugin  list|listfull [<name>]
-         load <filename>
-         autoload
-         reload|unload [<name>]
+         load <filename> [<arguments>]
+         autoload [<arguments>]
+         reload [<name> [<arguments>]]
+         unload [<name>]
 
-    list: list loaded plugins
-listfull: list loaded plugins (verbose)
-    load: load a plugin
-autoload: autoload plugins in system or user directory
-  reload: reload a plugin (if no name given, unload all plugins, then autoload plugins)
-  unload: unload a plugin (if no name given, unload all plugins)
-filename: plugin (file) to load
-    name: a plugin name
+     list: list loaded plugins
+ listfull: list loaded plugins (verbose)
+     load: load a plugin
+ autoload: autoload plugins in system or user directory
+   reload: reload a plugin (if no name given, unload all plugins, then autoload plugins)
+   unload: unload a plugin (if no name given, unload all plugins)
+ filename: plugin (file) to load
+     name: a plugin name
+arguments: arguments given to plugin on load
 
 Without argument, this command lists loaded plugins.
 ........................................
diff --git a/doc/fr/autogen/user/weechat_commands.txt b/doc/fr/autogen/user/weechat_commands.txt
index c10449ee5..0f13ad8f9 100644
--- a/doc/fr/autogen/user/weechat_commands.txt
+++ b/doc/fr/autogen/user/weechat_commands.txt
@@ -437,18 +437,20 @@ Exemples:
 [command]*`plugin`* lister/charger/décharger des extensions::
 ........................................
 /plugin  list|listfull [<nom>]
-         load <fichier>
-         autoload
-         reload|unload [<nom>]
+         load <fichier> [<paramètres>]
+         autoload [<paramètres>]
+         reload [<nom> [<paramètres]]
+         unload [<nom>]
 
-    list: lister les extensions chargées
-listfull: lister les extensions chargées (verbeux)
-    load: charger une extension
-autoload: charger automatiquement les extensions dans un répertoire système ou utilisateur
-  reload: recharger une extension (si pas de nom donné, décharger toutes les extensions, puis recharger automatiquement les extensions)
-  unload: décharger une extension (si pas de nom donné, décharger toutes les extensions)
- fichier: extension (fichier) à charger
-     nom: nom d'extension
+      list: lister les extensions chargées
+  listfull: lister les extensions chargées (verbeux)
+      load: charger une extension
+  autoload: charger automatiquement les extensions dans un répertoire système ou utilisateur
+    reload: recharger une extension (si pas de nom donné, décharger toutes les extensions, puis recharger automatiquement les extensions)
+    unload: décharger une extension (si pas de nom donné, décharger toutes les extensions)
+   fichier: extension (fichier) à charger
+       nom: nom d'extension
+paramètres: paramètres donnés à l'extension lors de son chargement
 
 Sans paramètre, cette commande liste les extensions chargées.
 ........................................
diff --git a/doc/it/autogen/user/weechat_commands.txt b/doc/it/autogen/user/weechat_commands.txt
index 84ec4bd06..6ca0c9197 100644
--- a/doc/it/autogen/user/weechat_commands.txt
+++ b/doc/it/autogen/user/weechat_commands.txt
@@ -436,21 +436,23 @@ Esempi:
 [[command_weechat_plugin]]
 [command]*`plugin`* elenca/carica/scarica plugin::
 ........................................
-/plugin  list|listfull [<nome>]
-         load <nomefile>
-         autoload
-         reload|unload [<nome>]
+/plugin  list|listfull [<name>]
+         load <filename> [<arguments>]
+         autoload [<arguments>]
+         reload [<name> [<arguments>]]
+         unload [<name>]
 
-    list: elenca i plugin caricati
-listfull: elenca i plugin caricati (dettagliato)
-    load: carica un plugin
-autoload: carica automaticamente un plugin nella cartella di sistema o utente
-  reload: ricarica un plugin (se non specificato, scarica e poi ricarica tutti i plugin)
-  unload: scarica un plugin (se non specificato, scarica tutti i plugin
-nomefile: plugin (file) da caricare
-    nome: nome di un plugin
+     list: list loaded plugins
+ listfull: list loaded plugins (verbose)
+     load: load a plugin
+ autoload: autoload plugins in system or user directory
+   reload: reload a plugin (if no name given, unload all plugins, then autoload plugins)
+   unload: unload a plugin (if no name given, unload all plugins)
+ filename: plugin (file) to load
+     name: a plugin name
+arguments: arguments given to plugin on load
 
-Senza argomento, questo comando elenca i plugin caricati.
+Without argument, this command lists loaded plugins.
 ........................................
 
 [[command_weechat_proxy]]
diff --git a/po/cs.po b/po/cs.po
index 2fee5ce52..ec2caf673 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-10-27 16:01+0200\n"
+"POT-Creation-Date: 2011-10-29 10:32+0200\n"
 "PO-Revision-Date: 2011-10-22 12:21+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1600,24 +1600,26 @@ msgstr ""
 msgid "list/load/unload plugins"
 msgstr "seznam/načíst/odebrat pluginy"
 
+#, fuzzy
 msgid ""
-"list|listfull [<name>] || load <filename> || autoload || reload|unload "
-"[<name>]"
+"list|listfull [<name>] || load <filename> [<arguments>] || autoload "
+"[<arguments>] || reload [<name> [<arguments>]] || unload [<name>]"
 msgstr ""
 "list|listfull [<jméno>] || load <jméno_souboru> || autoload || reload|unload "
 "[<jméno>]"
 
 #, fuzzy
 msgid ""
-"    list: list loaded plugins\n"
-"listfull: list loaded plugins (verbose)\n"
-"    load: load a plugin\n"
-"autoload: autoload plugins in system or user directory\n"
-"  reload: reload a plugin (if no name given, unload all plugins, then "
+"     list: list loaded plugins\n"
+" listfull: list loaded plugins (verbose)\n"
+"     load: load a plugin\n"
+" autoload: autoload plugins in system or user directory\n"
+"   reload: reload a plugin (if no name given, unload all plugins, then "
 "autoload plugins)\n"
-"  unload: unload a plugin (if no name given, unload all plugins)\n"
-"filename: plugin (file) to load\n"
-"    name: a plugin name\n"
+"   unload: unload a plugin (if no name given, unload all plugins)\n"
+" filename: plugin (file) to load\n"
+"     name: a plugin name\n"
+"arguments: arguments given to plugin on load\n"
 "\n"
 "Without argument, this command lists loaded plugins."
 msgstr ""
@@ -7608,6 +7610,13 @@ msgstr "%s%s: nemohu vyhodnotit interní kód WeeChat ruby"
 msgid "list/load/unload scripts"
 msgstr "seznam/načíst/odebrat skirpty"
 
+msgid ""
+"list|listfull [<name>] || load <filename> || autoload || reload|unload "
+"[<name>]"
+msgstr ""
+"list|listfull [<jméno>] || load <jméno_souboru> || autoload || reload|unload "
+"[<jméno>]"
+
 msgid ""
 "    list: list loaded scripts\n"
 "listfull: list loaded scripts (verbose)\n"
diff --git a/po/de.po b/po/de.po
index afb7fc664..b4151c7f0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-10-27 16:01+0200\n"
+"POT-Creation-Date: 2011-10-29 10:32+0200\n"
 "PO-Revision-Date: 2011-10-27 11:56+0200\n"
 "Last-Translator: Nils Görs\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1727,23 +1727,26 @@ msgstr ""
 msgid "list/load/unload plugins"
 msgstr "Erweiterungen verwalten (auflisten/installieren/deinstallieren)"
 
+#, fuzzy
 msgid ""
-"list|listfull [<name>] || load <filename> || autoload || reload|unload "
-"[<name>]"
+"list|listfull [<name>] || load <filename> [<arguments>] || autoload "
+"[<arguments>] || reload [<name> [<arguments>]] || unload [<name>]"
 msgstr ""
 "list|listfull [<name>] || load <filename> || autoload || reload|unload "
 "[<name>]"
 
+#, fuzzy
 msgid ""
-"    list: list loaded plugins\n"
-"listfull: list loaded plugins (verbose)\n"
-"    load: load a plugin\n"
-"autoload: autoload plugins in system or user directory\n"
-"  reload: reload a plugin (if no name given, unload all plugins, then "
+"     list: list loaded plugins\n"
+" listfull: list loaded plugins (verbose)\n"
+"     load: load a plugin\n"
+" autoload: autoload plugins in system or user directory\n"
+"   reload: reload a plugin (if no name given, unload all plugins, then "
 "autoload plugins)\n"
-"  unload: unload a plugin (if no name given, unload all plugins)\n"
-"filename: plugin (file) to load\n"
-"    name: a plugin name\n"
+"   unload: unload a plugin (if no name given, unload all plugins)\n"
+" filename: plugin (file) to load\n"
+"     name: a plugin name\n"
+"arguments: arguments given to plugin on load\n"
 "\n"
 "Without argument, this command lists loaded plugins."
 msgstr ""
@@ -8024,6 +8027,13 @@ msgstr "%s%s: Evaluation des internen WeeChat Ruby Codes nicht möglich"
 msgid "list/load/unload scripts"
 msgstr "auflisten/installieren/deinstallieren von Skripten"
 
+msgid ""
+"list|listfull [<name>] || load <filename> || autoload || reload|unload "
+"[<name>]"
+msgstr ""
+"list|listfull [<name>] || load <filename> || autoload || reload|unload "
+"[<name>]"
+
 msgid ""
 "    list: list loaded scripts\n"
 "listfull: list loaded scripts (verbose)\n"
diff --git a/po/es.po b/po/es.po
index bc3e57b64..3c4a1f2dd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-10-27 16:01+0200\n"
+"POT-Creation-Date: 2011-10-29 10:32+0200\n"
 "PO-Revision-Date: 2011-10-27 11:56+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1680,23 +1680,26 @@ msgstr ""
 msgid "list/load/unload plugins"
 msgstr "listar/cargar/descargar plugins"
 
+#, fuzzy
 msgid ""
-"list|listfull [<name>] || load <filename> || autoload || reload|unload "
-"[<name>]"
+"list|listfull [<name>] || load <filename> [<arguments>] || autoload "
+"[<arguments>] || reload [<name> [<arguments>]] || unload [<name>]"
 msgstr ""
 "list|listfull [<nombre>] || load <archivo> || autoload || reload|unload "
 "[<nombre>]"
 
+#, fuzzy
 msgid ""
-"    list: list loaded plugins\n"
-"listfull: list loaded plugins (verbose)\n"
-"    load: load a plugin\n"
-"autoload: autoload plugins in system or user directory\n"
-"  reload: reload a plugin (if no name given, unload all plugins, then "
+"     list: list loaded plugins\n"
+" listfull: list loaded plugins (verbose)\n"
+"     load: load a plugin\n"
+" autoload: autoload plugins in system or user directory\n"
+"   reload: reload a plugin (if no name given, unload all plugins, then "
 "autoload plugins)\n"
-"  unload: unload a plugin (if no name given, unload all plugins)\n"
-"filename: plugin (file) to load\n"
-"    name: a plugin name\n"
+"   unload: unload a plugin (if no name given, unload all plugins)\n"
+" filename: plugin (file) to load\n"
+"     name: a plugin name\n"
+"arguments: arguments given to plugin on load\n"
 "\n"
 "Without argument, this command lists loaded plugins."
 msgstr ""
@@ -7807,6 +7810,13 @@ msgstr "%s%s: no es posible evaluar el código ruby interno de WeeChat"
 msgid "list/load/unload scripts"
 msgstr "listar/cargar/descargar scripts"
 
+msgid ""
+"list|listfull [<name>] || load <filename> || autoload || reload|unload "
+"[<name>]"
+msgstr ""
+"list|listfull [<nombre>] || load <archivo> || autoload || reload|unload "
+"[<nombre>]"
+
 msgid ""
 "    list: list loaded scripts\n"
 "listfull: list loaded scripts (verbose)\n"
diff --git a/po/fr.po b/po/fr.po
index ba6b07c1f..7d9859a1e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-10-27 16:01+0200\n"
-"PO-Revision-Date: 2011-10-27 16:01+0200\n"
+"POT-Creation-Date: 2011-10-29 10:32+0200\n"
+"PO-Revision-Date: 2011-10-29 10:34+0200\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: French\n"
@@ -1681,35 +1681,38 @@ msgid "list/load/unload plugins"
 msgstr "lister/charger/décharger des extensions"
 
 msgid ""
-"list|listfull [<name>] || load <filename> || autoload || reload|unload "
-"[<name>]"
+"list|listfull [<name>] || load <filename> [<arguments>] || autoload "
+"[<arguments>] || reload [<name> [<arguments>]] || unload [<name>]"
 msgstr ""
-"list|listfull [<nom>] || load <fichier> || autoload || reload|unload [<nom>]"
+"list|listfull [<nom>] || load <fichier> [<paramètres>] || autoload "
+"[<paramètres>] || reload [<nom> [<paramètres]] || unload [<nom>]"
 
 msgid ""
-"    list: list loaded plugins\n"
-"listfull: list loaded plugins (verbose)\n"
-"    load: load a plugin\n"
-"autoload: autoload plugins in system or user directory\n"
-"  reload: reload a plugin (if no name given, unload all plugins, then "
+"     list: list loaded plugins\n"
+" listfull: list loaded plugins (verbose)\n"
+"     load: load a plugin\n"
+" autoload: autoload plugins in system or user directory\n"
+"   reload: reload a plugin (if no name given, unload all plugins, then "
 "autoload plugins)\n"
-"  unload: unload a plugin (if no name given, unload all plugins)\n"
-"filename: plugin (file) to load\n"
-"    name: a plugin name\n"
+"   unload: unload a plugin (if no name given, unload all plugins)\n"
+" filename: plugin (file) to load\n"
+"     name: a plugin name\n"
+"arguments: arguments given to plugin on load\n"
 "\n"
 "Without argument, this command lists loaded plugins."
 msgstr ""
-"    list: lister les extensions chargées\n"
-"listfull: lister les extensions chargées (verbeux)\n"
-"    load: charger une extension\n"
-"autoload: charger automatiquement les extensions dans un répertoire système "
-"ou utilisateur\n"
-"  reload: recharger une extension (si pas de nom donné, décharger toutes les "
-"extensions, puis recharger automatiquement les extensions)\n"
-"  unload: décharger une extension (si pas de nom donné, décharger toutes les "
-"extensions)\n"
-" fichier: extension (fichier) à charger\n"
-"     nom: nom d'extension\n"
+"      list: lister les extensions chargées\n"
+"  listfull: lister les extensions chargées (verbeux)\n"
+"      load: charger une extension\n"
+"  autoload: charger automatiquement les extensions dans un répertoire "
+"système ou utilisateur\n"
+"    reload: recharger une extension (si pas de nom donné, décharger toutes "
+"les extensions, puis recharger automatiquement les extensions)\n"
+"    unload: décharger une extension (si pas de nom donné, décharger toutes "
+"les extensions)\n"
+"   fichier: extension (fichier) à charger\n"
+"       nom: nom d'extension\n"
+"paramètres: paramètres donnés à l'extension lors de son chargement\n"
 "\n"
 "Sans paramètre, cette commande liste les extensions chargées."
 
@@ -7847,6 +7850,12 @@ msgstr "%s%s: impossible d'évaluer le code ruby interne WeeChat"
 msgid "list/load/unload scripts"
 msgstr "lister/charger/décharger des scripts"
 
+msgid ""
+"list|listfull [<name>] || load <filename> || autoload || reload|unload "
+"[<name>]"
+msgstr ""
+"list|listfull [<nom>] || load <fichier> || autoload || reload|unload [<nom>]"
+
 msgid ""
 "    list: list loaded scripts\n"
 "listfull: list loaded scripts (verbose)\n"
diff --git a/po/hu.po b/po/hu.po
index 58b80f6f3..25d456d9c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-10-27 16:01+0200\n"
+"POT-Creation-Date: 2011-10-29 10:32+0200\n"
 "PO-Revision-Date: 2011-10-22 12:21+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1394,23 +1394,24 @@ msgstr "modulok listázása/betöltése/eltávolítása"
 
 #, fuzzy
 msgid ""
-"list|listfull [<name>] || load <filename> || autoload || reload|unload "
-"[<name>]"
+"list|listfull [<name>] || load <filename> [<arguments>] || autoload "
+"[<arguments>] || reload [<name> [<arguments>]] || unload [<name>]"
 msgstr ""
 "[list [név]] | [listfull [név]] | [load fájlnév] | [autoload] | [reload "
 "[név]] | [unload [név]]"
 
 #, fuzzy
 msgid ""
-"    list: list loaded plugins\n"
-"listfull: list loaded plugins (verbose)\n"
-"    load: load a plugin\n"
-"autoload: autoload plugins in system or user directory\n"
-"  reload: reload a plugin (if no name given, unload all plugins, then "
+"     list: list loaded plugins\n"
+" listfull: list loaded plugins (verbose)\n"
+"     load: load a plugin\n"
+" autoload: autoload plugins in system or user directory\n"
+"   reload: reload a plugin (if no name given, unload all plugins, then "
 "autoload plugins)\n"
-"  unload: unload a plugin (if no name given, unload all plugins)\n"
-"filename: plugin (file) to load\n"
-"    name: a plugin name\n"
+"   unload: unload a plugin (if no name given, unload all plugins)\n"
+" filename: plugin (file) to load\n"
+"     name: a plugin name\n"
+"arguments: arguments given to plugin on load\n"
 "\n"
 "Without argument, this command lists loaded plugins."
 msgstr ""
@@ -7126,6 +7127,14 @@ msgstr "%s nem sikerült a szervert létrehozni\n"
 msgid "list/load/unload scripts"
 msgstr "modulok listázása/betöltése/eltávolítása"
 
+#, fuzzy
+msgid ""
+"list|listfull [<name>] || load <filename> || autoload || reload|unload "
+"[<name>]"
+msgstr ""
+"[list [név]] | [listfull [név]] | [load fájlnév] | [autoload] | [reload "
+"[név]] | [unload [név]]"
+
 #, fuzzy
 msgid ""
 "    list: list loaded scripts\n"
diff --git a/po/it.po b/po/it.po
index bcf9f9120..0dc64651f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-10-27 16:01+0200\n"
+"POT-Creation-Date: 2011-10-29 10:32+0200\n"
 "PO-Revision-Date: 2011-10-27 11:56+0200\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1673,23 +1673,26 @@ msgstr ""
 msgid "list/load/unload plugins"
 msgstr "elenca/carica/scarica plugin"
 
+#, fuzzy
 msgid ""
-"list|listfull [<name>] || load <filename> || autoload || reload|unload "
-"[<name>]"
+"list|listfull [<name>] || load <filename> [<arguments>] || autoload "
+"[<arguments>] || reload [<name> [<arguments>]] || unload [<name>]"
 msgstr ""
 "list|listfull [<nome>] || load <nomefile> || autoload || reload|unload "
 "[<nome>]"
 
+#, fuzzy
 msgid ""
-"    list: list loaded plugins\n"
-"listfull: list loaded plugins (verbose)\n"
-"    load: load a plugin\n"
-"autoload: autoload plugins in system or user directory\n"
-"  reload: reload a plugin (if no name given, unload all plugins, then "
+"     list: list loaded plugins\n"
+" listfull: list loaded plugins (verbose)\n"
+"     load: load a plugin\n"
+" autoload: autoload plugins in system or user directory\n"
+"   reload: reload a plugin (if no name given, unload all plugins, then "
 "autoload plugins)\n"
-"  unload: unload a plugin (if no name given, unload all plugins)\n"
-"filename: plugin (file) to load\n"
-"    name: a plugin name\n"
+"   unload: unload a plugin (if no name given, unload all plugins)\n"
+" filename: plugin (file) to load\n"
+"     name: a plugin name\n"
+"arguments: arguments given to plugin on load\n"
 "\n"
 "Without argument, this command lists loaded plugins."
 msgstr ""
@@ -7787,6 +7790,13 @@ msgstr "%s%s: impossibile analizzare il codice interno ruby di WeeChat"
 msgid "list/load/unload scripts"
 msgstr "elenca/carica/scarica script"
 
+msgid ""
+"list|listfull [<name>] || load <filename> || autoload || reload|unload "
+"[<name>]"
+msgstr ""
+"list|listfull [<nome>] || load <nomefile> || autoload || reload|unload "
+"[<nome>]"
+
 msgid ""
 "    list: list loaded scripts\n"
 "listfull: list loaded scripts (verbose)\n"
diff --git a/po/pl.po b/po/pl.po
index 3534f7f4d..8b1b1b64d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-10-27 16:01+0200\n"
+"POT-Creation-Date: 2011-10-29 10:32+0200\n"
 "PO-Revision-Date: 2011-10-27 11:56+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1685,23 +1685,26 @@ msgstr ""
 msgid "list/load/unload plugins"
 msgstr "lista/załaduj/wyładuj wtyczkę"
 
+#, fuzzy
 msgid ""
-"list|listfull [<name>] || load <filename> || autoload || reload|unload "
-"[<name>]"
+"list|listfull [<name>] || load <filename> [<arguments>] || autoload "
+"[<arguments>] || reload [<name> [<arguments>]] || unload [<name>]"
 msgstr ""
 "list|listfull [<nazwa>] || load <nazwapliku> || autoload || reload|unload "
 "[<nazwa>]"
 
+#, fuzzy
 msgid ""
-"    list: list loaded plugins\n"
-"listfull: list loaded plugins (verbose)\n"
-"    load: load a plugin\n"
-"autoload: autoload plugins in system or user directory\n"
-"  reload: reload a plugin (if no name given, unload all plugins, then "
+"     list: list loaded plugins\n"
+" listfull: list loaded plugins (verbose)\n"
+"     load: load a plugin\n"
+" autoload: autoload plugins in system or user directory\n"
+"   reload: reload a plugin (if no name given, unload all plugins, then "
 "autoload plugins)\n"
-"  unload: unload a plugin (if no name given, unload all plugins)\n"
-"filename: plugin (file) to load\n"
-"    name: a plugin name\n"
+"   unload: unload a plugin (if no name given, unload all plugins)\n"
+" filename: plugin (file) to load\n"
+"     name: a plugin name\n"
+"arguments: arguments given to plugin on load\n"
 "\n"
 "Without argument, this command lists loaded plugins."
 msgstr ""
@@ -7732,6 +7735,13 @@ msgstr "%s%s: nie można ocenić wewnętrznego kodu ruby w WeeChat"
 msgid "list/load/unload scripts"
 msgstr "list/load/unload skrypt"
 
+msgid ""
+"list|listfull [<name>] || load <filename> || autoload || reload|unload "
+"[<name>]"
+msgstr ""
+"list|listfull [<nazwa>] || load <nazwapliku> || autoload || reload|unload "
+"[<nazwa>]"
+
 msgid ""
 "    list: list loaded scripts\n"
 "listfull: list loaded scripts (verbose)\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 98f2d2d6c..a9001400d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-10-27 16:01+0200\n"
+"POT-Creation-Date: 2011-10-29 10:32+0200\n"
 "PO-Revision-Date: 2011-10-26 19:30+0200\n"
 "Last-Translator: Ivan Sichmann Freitas <ivansichfreitas@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1692,23 +1692,26 @@ msgstr ""
 msgid "list/load/unload plugins"
 msgstr "list/load/unload plugins"
 
+#, fuzzy
 msgid ""
-"list|listfull [<name>] || load <filename> || autoload || reload|unload "
-"[<name>]"
+"list|listfull [<name>] || load <filename> [<arguments>] || autoload "
+"[<arguments>] || reload [<name> [<arguments>]] || unload [<name>]"
 msgstr ""
 "list|listfull [<nome>] || load <arquivo> || autoload || reload|unload "
 "[<name>]"
 
+#, fuzzy
 msgid ""
-"    list: list loaded plugins\n"
-"listfull: list loaded plugins (verbose)\n"
-"    load: load a plugin\n"
-"autoload: autoload plugins in system or user directory\n"
-"  reload: reload a plugin (if no name given, unload all plugins, then "
+"     list: list loaded plugins\n"
+" listfull: list loaded plugins (verbose)\n"
+"     load: load a plugin\n"
+" autoload: autoload plugins in system or user directory\n"
+"   reload: reload a plugin (if no name given, unload all plugins, then "
 "autoload plugins)\n"
-"  unload: unload a plugin (if no name given, unload all plugins)\n"
-"filename: plugin (file) to load\n"
-"    name: a plugin name\n"
+"   unload: unload a plugin (if no name given, unload all plugins)\n"
+" filename: plugin (file) to load\n"
+"     name: a plugin name\n"
+"arguments: arguments given to plugin on load\n"
 "\n"
 "Without argument, this command lists loaded plugins."
 msgstr ""
@@ -7066,6 +7069,13 @@ msgstr ""
 msgid "list/load/unload scripts"
 msgstr ""
 
+msgid ""
+"list|listfull [<name>] || load <filename> || autoload || reload|unload "
+"[<name>]"
+msgstr ""
+"list|listfull [<nome>] || load <arquivo> || autoload || reload|unload "
+"[<name>]"
+
 # Find a better translation to the reload option
 #, fuzzy
 msgid ""
diff --git a/po/ru.po b/po/ru.po
index 5b6987133..5408beb30 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-10-27 16:01+0200\n"
+"POT-Creation-Date: 2011-10-29 10:32+0200\n"
 "PO-Revision-Date: 2011-10-22 12:21+0200\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1403,23 +1403,24 @@ msgstr "перечислить/загрузить/выгрузить plugin'ы"
 
 #, fuzzy
 msgid ""
-"list|listfull [<name>] || load <filename> || autoload || reload|unload "
-"[<name>]"
+"list|listfull [<name>] || load <filename> [<arguments>] || autoload "
+"[<arguments>] || reload [<name> [<arguments>]] || unload [<name>]"
 msgstr ""
 "[list [имя]] | [listfull [имя]] | [load имя_файла] | [autoload] | [reload "
 "[имя]] | [unload [имя]]"
 
 #, fuzzy
 msgid ""
-"    list: list loaded plugins\n"
-"listfull: list loaded plugins (verbose)\n"
-"    load: load a plugin\n"
-"autoload: autoload plugins in system or user directory\n"
-"  reload: reload a plugin (if no name given, unload all plugins, then "
+"     list: list loaded plugins\n"
+" listfull: list loaded plugins (verbose)\n"
+"     load: load a plugin\n"
+" autoload: autoload plugins in system or user directory\n"
+"   reload: reload a plugin (if no name given, unload all plugins, then "
 "autoload plugins)\n"
-"  unload: unload a plugin (if no name given, unload all plugins)\n"
-"filename: plugin (file) to load\n"
-"    name: a plugin name\n"
+"   unload: unload a plugin (if no name given, unload all plugins)\n"
+" filename: plugin (file) to load\n"
+"     name: a plugin name\n"
+"arguments: arguments given to plugin on load\n"
 "\n"
 "Without argument, this command lists loaded plugins."
 msgstr ""
@@ -7139,6 +7140,14 @@ msgstr "%s не могу создать сервер\n"
 msgid "list/load/unload scripts"
 msgstr "перечислить/загрузить/выгрузить plugin'ы"
 
+#, fuzzy
+msgid ""
+"list|listfull [<name>] || load <filename> || autoload || reload|unload "
+"[<name>]"
+msgstr ""
+"[list [имя]] | [listfull [имя]] | [load имя_файла] | [autoload] | [reload "
+"[имя]] | [unload [имя]]"
+
 #, fuzzy
 msgid ""
 "    list: list loaded scripts\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index c8a60774e..a763324cd 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-10-27 16:01+0200\n"
+"POT-Creation-Date: 2011-10-29 10:32+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1238,20 +1238,21 @@ msgid "list/load/unload plugins"
 msgstr ""
 
 msgid ""
-"list|listfull [<name>] || load <filename> || autoload || reload|unload "
-"[<name>]"
+"list|listfull [<name>] || load <filename> [<arguments>] || autoload "
+"[<arguments>] || reload [<name> [<arguments>]] || unload [<name>]"
 msgstr ""
 
 msgid ""
-"    list: list loaded plugins\n"
-"listfull: list loaded plugins (verbose)\n"
-"    load: load a plugin\n"
-"autoload: autoload plugins in system or user directory\n"
-"  reload: reload a plugin (if no name given, unload all plugins, then "
+"     list: list loaded plugins\n"
+" listfull: list loaded plugins (verbose)\n"
+"     load: load a plugin\n"
+" autoload: autoload plugins in system or user directory\n"
+"   reload: reload a plugin (if no name given, unload all plugins, then "
 "autoload plugins)\n"
-"  unload: unload a plugin (if no name given, unload all plugins)\n"
-"filename: plugin (file) to load\n"
-"    name: a plugin name\n"
+"   unload: unload a plugin (if no name given, unload all plugins)\n"
+" filename: plugin (file) to load\n"
+"     name: a plugin name\n"
+"arguments: arguments given to plugin on load\n"
 "\n"
 "Without argument, this command lists loaded plugins."
 msgstr ""
@@ -6259,6 +6260,11 @@ msgstr ""
 msgid "list/load/unload scripts"
 msgstr ""
 
+msgid ""
+"list|listfull [<name>] || load <filename> || autoload || reload|unload "
+"[<name>]"
+msgstr ""
+
 msgid ""
 "    list: list loaded scripts\n"
 "listfull: list loaded scripts (verbose)\n"
diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index d1e10180e..f59a54314 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -3521,60 +3521,109 @@ command_plugin_list (const char *name, int full)
 
 COMMAND_CALLBACK(plugin)
 {
+    int plugin_argc;
+    char **plugin_argv;
+
     /* make C compiler happy */
     (void) data;
     (void) buffer;
-    (void) argv_eol;
 
-    switch (argc)
+    if (argc == 1)
     {
-        case 1:
-            /* list all plugins */
-            command_plugin_list (NULL, 0);
-            break;
-        case 2:
-            if (string_strcasecmp (argv[1], "list") == 0)
-                command_plugin_list (NULL, 0);
-            else if (string_strcasecmp (argv[1], "listfull") == 0)
-                command_plugin_list (NULL, 1);
-            else if (string_strcasecmp (argv[1], "autoload") == 0)
-                plugin_auto_load ();
-            else if (string_strcasecmp (argv[1], "reload") == 0)
+        /* list all plugins */
+        command_plugin_list (NULL, 0);
+        return WEECHAT_RC_OK;
+    }
+
+    if (string_strcasecmp (argv[1], "list") == 0)
+    {
+        command_plugin_list ((argc > 2) ? argv[2] : NULL, 0);
+        return WEECHAT_RC_OK;
+    }
+
+    if (string_strcasecmp (argv[1], "listfull") == 0)
+    {
+        command_plugin_list ((argc > 2) ? argv[2] : NULL, 1);
+        return WEECHAT_RC_OK;
+    }
+
+    if (string_strcasecmp (argv[1], "autoload") == 0)
+    {
+        if (argc > 2)
+        {
+            plugin_argv = string_split (argv_eol[2], " ", 0, 0,
+                                        &plugin_argc);
+            plugin_auto_load (plugin_argc, plugin_argv);
+        }
+        else
+            plugin_auto_load (0, NULL);
+        return WEECHAT_RC_OK;
+    }
+
+    if (string_strcasecmp (argv[1], "load") == 0)
+    {
+        if (argc > 2)
+        {
+            if (argc > 3)
             {
-                plugin_unload_all ();
-                plugin_auto_load ();
+                plugin_argv = string_split (argv_eol[3], " ", 0, 0,
+                                            &plugin_argc);
+                plugin_load (argv[2], plugin_argc, plugin_argv);
+                if (plugin_argv)
+                    string_free_split (plugin_argv);
             }
-            else if (string_strcasecmp (argv[1], "unload") == 0)
-                plugin_unload_all ();
-            break;
-        case 3:
-            if (string_strcasecmp (argv[1], "list") == 0)
-                command_plugin_list (argv[2], 0);
-            else if (string_strcasecmp (argv[1], "listfull") == 0)
-                command_plugin_list (argv[2], 1);
-            else if (string_strcasecmp (argv[1], "load") == 0)
-                plugin_load (argv[2]);
-            else if (string_strcasecmp (argv[1], "reload") == 0)
-                plugin_reload_name (argv[2]);
-            else if (string_strcasecmp (argv[1], "unload") == 0)
-                plugin_unload_name (argv[2]);
             else
-            {
-                gui_chat_printf (NULL,
-                                 _("%sError: unknown option for \"%s\" "
-                                   "command"),
-                                 gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                                 "plugin");
-            }
-            break;
-        default:
+                plugin_load (argv[2], 0, NULL);
+        }
+        else
+        {
             gui_chat_printf (NULL,
                              _("%sError: wrong argument count for \"%s\" "
                                "command"),
                              gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
                              "plugin");
+        }
+        return WEECHAT_RC_OK;
     }
 
+    if (string_strcasecmp (argv[1], "reload") == 0)
+    {
+        if (argc > 2)
+        {
+            if (argc > 3)
+            {
+                plugin_argv = string_split (argv_eol[3], " ", 0, 0,
+                                            &plugin_argc);
+                plugin_reload_name (argv[2], plugin_argc, plugin_argv);
+                if (plugin_argv)
+                    string_free_split (plugin_argv);
+            }
+            else
+                plugin_reload_name (argv[2], 0, NULL);
+        }
+        else
+        {
+            plugin_unload_all ();
+            plugin_auto_load (0, NULL);
+        }
+        return WEECHAT_RC_OK;
+    }
+
+    if (string_strcasecmp (argv[1], "unload") == 0)
+    {
+        if (argc > 2)
+            plugin_unload_name (argv[2]);
+        else
+            plugin_unload_all ();
+        return WEECHAT_RC_OK;
+    }
+
+    gui_chat_printf (NULL,
+                     _("%sError: unknown option for \"%s\" "
+                       "command"),
+                     gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
+                     "plugin");
+
     return WEECHAT_RC_OK;
 }
 
@@ -5775,19 +5824,21 @@ command_init ()
     hook_command (NULL, "plugin",
                   N_("list/load/unload plugins"),
                   N_("list|listfull [<name>]"
-                     " || load <filename>"
-                     " || autoload"
-                     " || reload|unload [<name>]"),
-                  N_("    list: list loaded plugins\n"
-                     "listfull: list loaded plugins (verbose)\n"
-                     "    load: load a plugin\n"
-                     "autoload: autoload plugins in system or user directory\n"
-                     "  reload: reload a plugin (if no name given, unload "
+                     " || load <filename> [<arguments>]"
+                     " || autoload [<arguments>]"
+                     " || reload [<name> [<arguments>]]"
+                     " || unload [<name>]"),
+                  N_("     list: list loaded plugins\n"
+                     " listfull: list loaded plugins (verbose)\n"
+                     "     load: load a plugin\n"
+                     " autoload: autoload plugins in system or user directory\n"
+                     "   reload: reload a plugin (if no name given, unload "
                      "all plugins, then autoload plugins)\n"
-                     "  unload: unload a plugin (if no name given, unload "
+                     "   unload: unload a plugin (if no name given, unload "
                      "all plugins)\n"
-                     "filename: plugin (file) to load\n"
-                     "    name: a plugin name\n\n"
+                     " filename: plugin (file) to load\n"
+                     "     name: a plugin name\n"
+                     "arguments: arguments given to plugin on load\n\n"
                      "Without argument, this command lists loaded plugins."),
                   "list %(plugins_names)"
                   " || listfull %(plugins_names)"
diff --git a/src/plugins/plugin.c b/src/plugins/plugin.c
index d2a7dd733..a298c830d 100644
--- a/src/plugins/plugin.c
+++ b/src/plugins/plugin.c
@@ -67,8 +67,12 @@ int plugin_quiet = 0;
 struct t_weechat_plugin *weechat_plugins = NULL;
 struct t_weechat_plugin *last_weechat_plugin = NULL;
 
-int plugin_argc;                       /* command line arguments (used only */
-char **plugin_argv;                    /* first time loading plugin)        */
+/* structure used to give arguments to callback of ... */
+struct t_plugin_args
+{
+    int argc;
+    char **argv;
+};
 
 int plugin_autoload_count = 0;         /* number of items in autoload_array */
 char **plugin_autoload_array = NULL;   /* autoload array, this is split of  */
@@ -236,15 +240,15 @@ plugin_find_pos (struct t_weechat_plugin *plugin)
  */
 
 struct t_weechat_plugin *
-plugin_load (const char *filename)
+plugin_load (const char *filename, int argc, char **argv)
 {
     char *full_name, *full_name2;
     void *handle;
     char *name, *api_version, *author, *description, *version;
     char *license, *charset;
     t_weechat_init_func *init_func;
-    int rc, i, argc;
-    char **argv;
+    int rc, i, plugin_argc;
+    char **plugin_argv;
     struct t_weechat_plugin *new_plugin;
     struct t_config_option *ptr_option;
 
@@ -729,42 +733,43 @@ plugin_load (const char *filename)
         gui_buffer_set_plugin_for_upgrade (name, new_plugin);
 
         /* build arguments for plugin */
-        argc = 0;
-        argv = NULL;
-        if (plugin_argc > 0)
+        plugin_argc = 0;
+        plugin_argv = NULL;
+        if (argc > 0)
         {
-            argv = malloc ((plugin_argc + 1) * sizeof (*argv));
-            if (argv)
+            plugin_argv = malloc ((argc + 1) * sizeof (*plugin_argv));
+            if (plugin_argv)
             {
-                argc = 0;
-                for (i = 0; i < plugin_argc; i++)
+                plugin_argc = 0;
+                for (i = 0; i < argc; i++)
                 {
-                    if ((strcmp (plugin_argv[i], "-a") == 0)
-                        || (strcmp (plugin_argv[i], "--no-connect") == 0)
-                        || (strcmp (plugin_argv[i], "-s") == 0)
-                        || (strcmp (plugin_argv[i], "--no-script") == 0)
-                        || (strcmp (plugin_argv[i], "--upgrade") == 0)
-                        || (strncmp (plugin_argv[i], name, strlen (name)) == 0))
+                    if ((strcmp (argv[i], "-a") == 0)
+                        || (strcmp (argv[i], "--no-connect") == 0)
+                        || (strcmp (argv[i], "-s") == 0)
+                        || (strcmp (argv[i], "--no-script") == 0)
+                        || (strcmp (argv[i], "--upgrade") == 0)
+                        || (strncmp (argv[i], name, strlen (name)) == 0))
                     {
-                        argv[argc] = plugin_argv[i];
-                        argc++;
+                        plugin_argv[plugin_argc] = argv[i];
+                        plugin_argc++;
                     }
                 }
-                if (argc == 0)
+                if (plugin_argc == 0)
                 {
-                    free (argv);
-                    argv = NULL;
+                    free (plugin_argv);
+                    plugin_argv = NULL;
                 }
                 else
-                    argv[argc] = NULL;
+                    plugin_argv[plugin_argc] = NULL;
             }
         }
 
         /* init plugin */
-        rc = ((t_weechat_init_func *)init_func) (new_plugin, argc, argv);
+        rc = ((t_weechat_init_func *)init_func) (new_plugin,
+                                                 plugin_argc, plugin_argv);
 
-        if (argv)
-            free (argv);
+        if (plugin_argv)
+            free (plugin_argv);
 
         if (rc != WEECHAT_RC_OK)
         {
@@ -808,12 +813,12 @@ plugin_load (const char *filename)
  */
 
 void
-plugin_auto_load_file (void *plugin, const char *filename)
+plugin_auto_load_file (void *args, const char *filename)
 {
+    struct t_plugin_args *plugin_args;
     char *pos;
 
-    /* make C compiler happy */
-    (void) plugin;
+    plugin_args = (struct t_plugin_args *)args;
 
     if (CONFIG_STRING(config_plugin_extension)
         && CONFIG_STRING(config_plugin_extension)[0])
@@ -824,12 +829,12 @@ plugin_auto_load_file (void *plugin, const char *filename)
             if (string_strcasecmp (pos,
                                    CONFIG_STRING(config_plugin_extension)) == 0)
             {
-                plugin_load (filename);
+                plugin_load (filename, plugin_args->argc, plugin_args->argv);
             }
         }
     }
     else
-        plugin_load (filename);
+        plugin_load (filename, plugin_args->argc, plugin_args->argv);
 }
 
 /*
@@ -838,9 +843,13 @@ plugin_auto_load_file (void *plugin, const char *filename)
  */
 
 void
-plugin_auto_load ()
+plugin_auto_load (int argc, char **argv)
 {
     char *dir_name, *plugin_path, *plugin_path2;
+    struct t_plugin_args plugin_args;
+
+    plugin_args.argc = argc;
+    plugin_args.argv = argv;
 
     plugin_autoload_array = NULL;
     plugin_autoload_count = 0;
@@ -865,7 +874,7 @@ plugin_auto_load ()
                             plugin_path2 : ((plugin_path) ?
                                             plugin_path : CONFIG_STRING(config_plugin_path)),
                             0,
-                            NULL,
+                            &plugin_args,
                             &plugin_auto_load_file);
         if (plugin_path)
             free (plugin_path);
@@ -879,7 +888,7 @@ plugin_auto_load ()
     {
         snprintf (dir_name, strlen (WEECHAT_LIBDIR) + 16,
                   "%s/plugins", WEECHAT_LIBDIR);
-        util_exec_on_files (dir_name, 0, NULL, &plugin_auto_load_file);
+        util_exec_on_files (dir_name, 0, &plugin_args, &plugin_auto_load_file);
         free (dir_name);
     }
 
@@ -1044,7 +1053,7 @@ plugin_unload_all ()
  */
 
 void
-plugin_reload_name (const char *name)
+plugin_reload_name (const char *name, int argc, char **argv)
 {
     struct t_weechat_plugin *ptr_plugin;
     char *filename;
@@ -1056,7 +1065,7 @@ plugin_reload_name (const char *name)
         if (filename)
         {
             plugin_unload (ptr_plugin);
-            plugin_load (filename);
+            plugin_load (filename, argc, argv);
             free (filename);
         }
     }
@@ -1127,9 +1136,6 @@ plugin_display_short_list ()
 void
 plugin_init (int auto_load, int argc, char *argv[])
 {
-    plugin_argc = argc;
-    plugin_argv = argv;
-
     /* init plugin API (create some hooks) */
     plugin_api_init ();
 
@@ -1141,14 +1147,10 @@ plugin_init (int auto_load, int argc, char *argv[])
     if (auto_load)
     {
         plugin_quiet = 1;
-        plugin_auto_load ();
+        plugin_auto_load (argc, argv);
         plugin_display_short_list ();
         plugin_quiet = 0;
     }
-
-    /* discard command arguments for future plugins */
-    plugin_argc = 0;
-    plugin_argv = NULL;
 }
 
 /*
diff --git a/src/plugins/plugin.h b/src/plugins/plugin.h
index 71db57d41..c41dcabf1 100644
--- a/src/plugins/plugin.h
+++ b/src/plugins/plugin.h
@@ -34,12 +34,13 @@ extern struct t_weechat_plugin *last_weechat_plugin;
 extern int plugin_valid (struct t_weechat_plugin *plugin);
 extern struct t_weechat_plugin *plugin_search (const char *name);
 extern const char *plugin_get_name (struct t_weechat_plugin *plugin);
-extern struct t_weechat_plugin *plugin_load (const char *filename);
-extern void plugin_auto_load ();
+extern struct t_weechat_plugin *plugin_load (const char *filename,
+                                             int argc, char **argv);
+extern void plugin_auto_load (int argc, char **argv);
 extern void plugin_unload (struct t_weechat_plugin *plugin);
 extern void plugin_unload_name (const char *name);
 extern void plugin_unload_all ();
-extern void plugin_reload_name (const char *name);
+extern void plugin_reload_name (const char *name, int argc, char **argv);
 extern void plugin_init (int auto_load, int argc, char *argv[]);
 extern void plugin_end ();
 extern struct t_hdata *plugin_hdata_plugin_cb (void *data,