diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index cb690906..2c61df70 100644
--- a/src/perl/perl-core.c
+++ b/src/perl/perl-core.c
@@ -393,7 +393,7 @@ int perl_get_api_version(void)
         return IRSSI_PERL_API_VERSION;
 }
 
-static void perl_scripts_autorun(void)
+void perl_scripts_autorun(void)
 {
 	DIR *dirp;
 	struct dirent *dp;
diff --git a/src/perl/perl-core.h b/src/perl/perl-core.h
index b451cc5c..7390a6fd 100644
--- a/src/perl/perl-core.h
+++ b/src/perl/perl-core.h
@@ -16,6 +16,8 @@ extern GSList *perl_scripts;
 void perl_scripts_init(void);
 /* Destroy all perl scripts and deinitialize perl interpreter */
 void perl_scripts_deinit(void);
+/* Load all the scripts in the autorun/ folder */
+void perl_scripts_autorun(void);
 
 /* Load a perl script, path must be a full path. */
 PERL_SCRIPT_REC *perl_script_load_file(const char *path);
diff --git a/src/perl/perl-fe.c b/src/perl/perl-fe.c
index 04305b63..396c80b7 100644
--- a/src/perl/perl-fe.c
+++ b/src/perl/perl-fe.c
@@ -119,8 +119,20 @@ static void cmd_script_unload(const char *data)
 
 static void cmd_script_reset(const char *data)
 {
+	void *free_arg;
+	GHashTable *optlist;
+
+	if (!cmd_get_params(data, &free_arg, 0 | PARAM_FLAG_OPTIONS,
+			    "script reset", &optlist))
+		return;
+
 	perl_scripts_deinit();
 	perl_scripts_init();
+
+	if (g_hash_table_lookup(optlist, "autorun") != NULL)
+		perl_scripts_autorun();
+
+	cmd_params_free(free_arg);
 }
 
 static void cmd_script_list(void)
@@ -251,6 +263,7 @@ void fe_perl_init(void)
 	command_bind("script list", NULL, (SIGNAL_FUNC) cmd_script_list);
 	command_bind("load", NULL, (SIGNAL_FUNC) cmd_load);
 	command_set_options("script exec", "permanent");
+	command_set_options("script reset", "autorun");
 
         signal_add("script error", (SIGNAL_FUNC) sig_script_error);
 	signal_add("complete command script load", (SIGNAL_FUNC) sig_complete_load);