diff --git a/src/common/weechat.c b/src/common/weechat.c
index bc4d87a15..454563aa2 100644
--- a/src/common/weechat.c
+++ b/src/common/weechat.c
@@ -130,11 +130,16 @@ wee_parse_args (int argc, char *argv[])
                         {
                             case OPTION_TYPE_BOOLEAN:
                                 printf (_("  . type boolean (values: 'on' or 'off')\n"));
+                                printf (_("  . default value: '%s'\n"),
+                                    (weechat_options[j][k].default_int == BOOL_TRUE) ?
+                                    "on" : "off");
                                 break;
                             case OPTION_TYPE_INT:
                                 printf (_("  . type integer (values: between %d and %d)\n"),
                                     weechat_options[j][k].min,
                                     weechat_options[j][k].max);
+                                printf (_("  . default value: %d\n"),
+                                    weechat_options[j][k].default_int);
                                 break;
                             case OPTION_TYPE_INT_WITH_STRING:
                                 printf (_("  . type string (values: "));
@@ -148,12 +153,21 @@ wee_parse_args (int argc, char *argv[])
                                     m++;
                                 }
                                 printf (")\n");
+                                printf (_("  . default value: '%s'\n"),
+                                    (weechat_options[j][k].default_string) ?
+                                    weechat_options[j][k].default_string : _("empty"));
                                 break;
                             case OPTION_TYPE_COLOR:
                                 printf (_("  . type color (Curses or Gtk color, look at WeeChat doc)\n"));
+                                printf (_("  . default value: '%s'\n"),
+                                    (weechat_options[j][k].default_string) ?
+                                    weechat_options[j][k].default_string : _("empty"));
                                 break;
                             case OPTION_TYPE_STRING:
                                 printf (_("  . type string (any string)\n"));
+                                printf (_("  . default value: '%s'\n"),
+                                    (weechat_options[j][k].default_string) ?
+                                    weechat_options[j][k].default_string : _("empty"));
                                 break;
                         }
                         printf (_("  . description: %s\n\n"),
diff --git a/src/common/weeconfig.c b/src/common/weeconfig.c
index a8f8543d0..bf0bd54cc 100644
--- a/src/common/weeconfig.c
+++ b/src/common/weeconfig.c
@@ -401,8 +401,8 @@ t_config_option weechat_options_dcc[] =
     NULL, NULL, &cfg_dcc_timeout, NULL, NULL },
   { "dcc_download_path", N_("path for incoming files with dcc"),
     N_("path for writing incoming files with dcc (default: user home)"),
-    OPTION_TYPE_STRING, 0, 0, 0, "~",
-    NULL, NULL, &cfg_dcc_download_path, NULL },
+    OPTION_TYPE_STRING, 0, 0, 0,
+    "~", NULL, NULL, &cfg_dcc_download_path, NULL },
   { "dcc_upload_path", N_("default path for sending files with dcc"),
     N_("path for reading files when sending thru dcc (when no path is specified)"),
     OPTION_TYPE_STRING, 0, 0, 0, "~",
diff --git a/weechat/src/common/weechat.c b/weechat/src/common/weechat.c
index bc4d87a15..454563aa2 100644
--- a/weechat/src/common/weechat.c
+++ b/weechat/src/common/weechat.c
@@ -130,11 +130,16 @@ wee_parse_args (int argc, char *argv[])
                         {
                             case OPTION_TYPE_BOOLEAN:
                                 printf (_("  . type boolean (values: 'on' or 'off')\n"));
+                                printf (_("  . default value: '%s'\n"),
+                                    (weechat_options[j][k].default_int == BOOL_TRUE) ?
+                                    "on" : "off");
                                 break;
                             case OPTION_TYPE_INT:
                                 printf (_("  . type integer (values: between %d and %d)\n"),
                                     weechat_options[j][k].min,
                                     weechat_options[j][k].max);
+                                printf (_("  . default value: %d\n"),
+                                    weechat_options[j][k].default_int);
                                 break;
                             case OPTION_TYPE_INT_WITH_STRING:
                                 printf (_("  . type string (values: "));
@@ -148,12 +153,21 @@ wee_parse_args (int argc, char *argv[])
                                     m++;
                                 }
                                 printf (")\n");
+                                printf (_("  . default value: '%s'\n"),
+                                    (weechat_options[j][k].default_string) ?
+                                    weechat_options[j][k].default_string : _("empty"));
                                 break;
                             case OPTION_TYPE_COLOR:
                                 printf (_("  . type color (Curses or Gtk color, look at WeeChat doc)\n"));
+                                printf (_("  . default value: '%s'\n"),
+                                    (weechat_options[j][k].default_string) ?
+                                    weechat_options[j][k].default_string : _("empty"));
                                 break;
                             case OPTION_TYPE_STRING:
                                 printf (_("  . type string (any string)\n"));
+                                printf (_("  . default value: '%s'\n"),
+                                    (weechat_options[j][k].default_string) ?
+                                    weechat_options[j][k].default_string : _("empty"));
                                 break;
                         }
                         printf (_("  . description: %s\n\n"),
diff --git a/weechat/src/common/weeconfig.c b/weechat/src/common/weeconfig.c
index a8f8543d0..bf0bd54cc 100644
--- a/weechat/src/common/weeconfig.c
+++ b/weechat/src/common/weeconfig.c
@@ -401,8 +401,8 @@ t_config_option weechat_options_dcc[] =
     NULL, NULL, &cfg_dcc_timeout, NULL, NULL },
   { "dcc_download_path", N_("path for incoming files with dcc"),
     N_("path for writing incoming files with dcc (default: user home)"),
-    OPTION_TYPE_STRING, 0, 0, 0, "~",
-    NULL, NULL, &cfg_dcc_download_path, NULL },
+    OPTION_TYPE_STRING, 0, 0, 0,
+    "~", NULL, NULL, &cfg_dcc_download_path, NULL },
   { "dcc_upload_path", N_("default path for sending files with dcc"),
     N_("path for reading files when sending thru dcc (when no path is specified)"),
     OPTION_TYPE_STRING, 0, 0, 0, "~",