diff --git a/VisualEditor.php b/VisualEditor.php
index 432c3c37b8..0ede8609e6 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -1564,6 +1564,8 @@ $wgVisualEditorBrowserBlacklist = array(
 	// Firefox issues in versions 12 and below (bug 50780)
 	// Wikilink [[./]] bug in Firefox 14 and below (bug 50720)
 	'firefox' => array( array( '<=', 14 ) ),
+	// Safari corruption issues from various old browser plugins
+	'safari' => array( array( '<=', 6 ) ),
 	// Opera < 12 was not tested and it's userbase is almost nonexistent anyway
 	'opera' => array( array( '<', 12 ) ),
 	// Blacklist all versions:
diff --git a/extension.json b/extension.json
index 8ddaf349c7..e67ae20972 100644
--- a/extension.json
+++ b/extension.json
@@ -78,6 +78,12 @@
 					14
 				]
 			],
+			"safari": [
+				[
+					"<=",
+					6
+				]
+			],
 			"opera": [
 				[
 					"<",
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 0529dee525..0614b97b90 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -130,7 +130,7 @@ ve.init.mw.ViewPageTarget.compatibility = {
 	whitelist: {
 		firefox: [['>=', 15]],
 		iceweasel: [['>=', 10]],
-		safari: [['>=', 6]],
+		safari: [['>=', 7]],
 		chrome: [['>=', 19]],
 		opera: [['>=', 15]]
 	}
diff --git a/modules/ve-mw/tests/init/targets/ve.init.mw.ViewPageTarget.test.js b/modules/ve-mw/tests/init/targets/ve.init.mw.ViewPageTarget.test.js
index 0bc87ab37a..d977309cfd 100644
--- a/modules/ve-mw/tests/init/targets/ve.init.mw.ViewPageTarget.test.js
+++ b/modules/ve-mw/tests/init/targets/ve.init.mw.ViewPageTarget.test.js
@@ -94,16 +94,26 @@ QUnit.test( 'compatibility', function ( assert ) {
 			{
 				msg: 'Safari 4',
 				userAgent: 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_3; en-us) AppleWebKit/531.21.11 (KHTML, like Gecko) Version/4.0.4 Safari/531.21.10',
-				matches: []
+				matches: [ 'blacklist' ]
 			},
 			{
 				msg: 'Safari 5',
 				userAgent: 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_3; en-us) AppleWebKit/534.1+ (KHTML, like Gecko) Version/5.0 Safari/533.16',
-				matches: []
+				matches: [ 'blacklist' ]
 			},
 			{
 				msg: 'Safari 6',
 				userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 1084) AppleWebKit/536.30.1 (KHTML like Gecko) Version/6.0.5 Safari/536.30.1',
+				matches: [ 'blacklist' ]
+			},
+			{
+				msg: 'Safari 7',
+				userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.75.14 (KHTML, like Gecko) Version/7.0.3 Safari/7046A194A',
+				matches: [ 'whitelist' ]
+			},
+			{
+				msg: 'Safari 8',
+				userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_2) AppleWebKit/600.3.18 (KHTML, like Gecko) Version/8.0.3 Safari/600.3.18',
 				matches: [ 'whitelist' ]
 			},
 			{