diff --git a/content/io.js b/content/io.js
index 55502000..fcaa3613 100644
--- a/content/io.js
+++ b/content/io.js
@@ -198,6 +198,8 @@ liberator.IO = function () //{{{
             var command = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "<br/>";
 
             liberator.echo(command + liberator.util.escapeHTML(output));
+
+            liberator.autocommands.trigger("ShellCmdPost", "");
         });
 
     /////////////////////////////////////////////////////////////////////////////}}}
diff --git a/content/liberator.js b/content/liberator.js
index 2486537b..de635666 100644
--- a/content/liberator.js
+++ b/content/liberator.js
@@ -1026,6 +1026,8 @@ const liberator = (function () //{{{
 
         shutdown: function ()
         {
+            liberator.autocommands.trigger("QuitPre", "");
+
             // save our preferences
             liberator.commandline.destroy();
             liberator.options.destroy();
diff --git a/content/vimperator.js b/content/vimperator.js
index dccd3a0b..45676156 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -41,7 +41,9 @@ liberator.config = { //{{{
     autocommands: [["LocationChange", "Triggered when changing tabs or when naviagtion to a new location"],
                    ["PageLoadPre",    "Triggered after a page load is initiated"],
                    ["PageLoad",       "Triggered when a page gets (re)loaded/opened"],
+                   ["QuitPre",        "Triggered before exiting Firefox, just before destroying each module"],
                    ["Quit",           "Triggered before exiting Firefox"],
+                   ["ShellCmdPost",   "Triggered after executing a shell command with :!cmd"],
                    ["Startup",        "Triggered after Firefox starts"]],
 
     dialogs: [
diff --git a/locale/en-US/autocommands.txt b/locale/en-US/autocommands.txt
index 21dde264..c677b839 100644
--- a/locale/en-US/autocommands.txt
+++ b/locale/en-US/autocommands.txt
@@ -23,7 +23,9 @@ Available {events}:
 *LocationChange* Triggered when changing tabs or when navigating to a new location
 *PageLoadPre*    Triggered after a page load is initiated.
 *PageLoad*       Triggered when a page gets (re)loaded/opened
+*QuitPre*        Triggered before exiting Firefox, just before destroying each module
 *Quit*           Triggered before exiting Firefox
+*ShellCmdPost*   Triggered after executing a shell command with :!cmd
 *Startup*        Triggered after Firefox starts
 --------------------------------------------------------------