diff --git a/CHANGELOG b/CHANGELOG
index 46bfb7f64..cb9a60c70 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,8 @@ Version 1.7.0
     * completely rewritten bookmarks (including multi-level folders support)
     * menus are not closed when opening links with middle mouse button
     * support for shadow builds with Qt Creator
+    * GreaseMonkey: correctly load scripts in frames
+    * GreaseMonkey: fix rare issue that userscripts won't load on some sites
 
 Version 1.6.6
     * released 12 May 2014
diff --git a/src/plugins/GreaseMonkey/gm_manager.cpp b/src/plugins/GreaseMonkey/gm_manager.cpp
index 0a6789e6e..bb8d04cbe 100644
--- a/src/plugins/GreaseMonkey/gm_manager.cpp
+++ b/src/plugins/GreaseMonkey/gm_manager.cpp
@@ -220,7 +220,7 @@ void GM_Manager::frameLoadStart()
     foreach (GM_Script* script, m_endScripts) {
         if (script->match(urlString)) {
             const QString jscript = QString(QSL("window.addEventListener(\"DOMContentLoaded\","
-                                            "function(e) { \n%1\n }, false);")).arg(m_bootstrap + script->script());
+                                            "function(e) { \n%1\n }, true);")).arg(m_bootstrap + script->script());
             frame->evaluateJavaScript(jscript);
         }
     }
diff --git a/src/plugins/GreaseMonkey/gm_plugin.cpp b/src/plugins/GreaseMonkey/gm_plugin.cpp
index 027490dc3..8f0902b2a 100644
--- a/src/plugins/GreaseMonkey/gm_plugin.cpp
+++ b/src/plugins/GreaseMonkey/gm_plugin.cpp
@@ -41,7 +41,7 @@ PluginSpec GM_Plugin::pluginSpec()
     spec.name = "GreaseMonkey";
     spec.info = "Userscripts for QupZilla";
     spec.description = "Provides support for userscripts (www.userscripts.org)";
-    spec.version = "0.5.0";
+    spec.version = "0.5.1";
     spec.author = "David Rosca <nowrep@gmail.com>";
     spec.icon = QPixmap(":gm/data/icon.png");
     spec.hasSettings = true;