diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40c618f92..4e3987df2 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@
 - In v1.5.1, image/video hover was changed to hide and re-use the images/videos to avoid crashes.
   Fixing bugs caused by this change.
 
+**duckness**
+- Allow disabling upgrade nag message.
+
 ### v1.5.2 
 *2014-04-04*
 
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 8ab645bef..cea2a348d 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -152,7 +152,8 @@
         'Emoji': [false, 'Adds icons next to names for different emails'],
         'Color User IDs': [false, 'Assign unique colors to user IDs on boards that use them'],
         'Remove Spoilers': [false, 'Remove all spoilers in text.'],
-        'Reveal Spoilers': [false, 'Indicate spoilers if Remove Spoilers is enabled, or make the text appear hovered if Remove Spoiler is disabled.']
+        'Reveal Spoilers': [false, 'Indicate spoilers if Remove Spoilers is enabled, or make the text appear hovered if Remove Spoiler is disabled.'],
+        'Show Support Message': [true, 'Warn if your browser is unsupported. 4chan X may not operate correctly on unsupported browser versions.']
       },
       'Linkification': {
         'Linkify': [true, 'Convert text into links where applicable.'],
@@ -13351,7 +13352,7 @@
       }
       test = $.el('span');
       test.classList.add('a', 'b');
-      if (test.className !== 'a b') {
+      if (test.className !== 'a b' && Conf['Show Support Message']) {
         new Notice('warning', "Your version of Firefox is outdated (v26 minimum) and 4chan X may not operate correctly.", 30);
       }
       GMver = GM_info.version.split('.');
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 098279dc3..8179d7e07 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -128,7 +128,8 @@
         'Emoji': [false, 'Adds icons next to names for different emails'],
         'Color User IDs': [false, 'Assign unique colors to user IDs on boards that use them'],
         'Remove Spoilers': [false, 'Remove all spoilers in text.'],
-        'Reveal Spoilers': [false, 'Indicate spoilers if Remove Spoilers is enabled, or make the text appear hovered if Remove Spoiler is disabled.']
+        'Reveal Spoilers': [false, 'Indicate spoilers if Remove Spoilers is enabled, or make the text appear hovered if Remove Spoiler is disabled.'],
+        'Show Support Message': [true, 'Warn if your browser is unsupported. 4chan X may not operate correctly on unsupported browser versions.']
       },
       'Linkification': {
         'Linkify': [true, 'Convert text into links where applicable.'],
diff --git a/src/General/Config.coffee b/src/General/Config.coffee
index cc0db76c5..28b76664b 100755
--- a/src/General/Config.coffee
+++ b/src/General/Config.coffee
@@ -89,6 +89,10 @@ Config =
         false
         'Indicate spoilers if Remove Spoilers is enabled, or make the text appear hovered if Remove Spoiler is disabled.'
       ]
+      'Show Support Message': [
+        true
+        'Warn if your browser is unsupported. 4chan X may not operate correctly on unsupported browser versions.'
+      ]
 
     'Linkification':
       'Linkify': [
diff --git a/src/General/Main.coffee b/src/General/Main.coffee
index cf4bb011d..2b1625205 100755
--- a/src/General/Main.coffee
+++ b/src/General/Main.coffee
@@ -137,7 +137,7 @@ Main =
     <% if (type === 'userscript') { %>
     test = $.el 'span'
     test.classList.add 'a', 'b'
-    if test.className isnt 'a b'
+    if test.className isnt 'a b' and Conf['Show Support Message']
       new Notice 'warning', "Your version of Firefox is outdated (v<%= meta.min.firefox %> minimum) and <%= meta.name %> may not operate correctly.", 30
 
     GMver = GM_info.version.split '.'