diff --git a/javascript/CMSMain_upload.js b/javascript/CMSMain_upload.js
index 7f22dc05..d6dca3ee 100644
--- a/javascript/CMSMain_upload.js
+++ b/javascript/CMSMain_upload.js
@@ -5,7 +5,14 @@
 */
 CMSMain_upload = Class.create();
 CMSMain_upload.prototype = {
-    initialize: function() {
+    initialize: function() {
+        // Due to a bug in the flash plugin on Linux and Mac, we need at least version 9.0.64 to use SWFUpload
+        if(navigator.appVersion.indexOf("Mac") != -1 || navigator.appVersion.indexOf("X11") != -1 || navigator.appVersion.indexOf("Linux") != -1) {
+           pv = getFlashPlayerVersion();
+           if(pv.major < 9 || (pv.major == 9 && pv.minor == 0 && pv.rev < 64)) {
+              return;
+           }
+        }
         this.iframe = window.top.document.getElementById('AssetAdmin_upload');
         this.onLoad();
     },
diff --git a/javascript/TinyMCEImageEnhancement.js b/javascript/TinyMCEImageEnhancement.js
index d3f67efa..5f1cdd3e 100644
--- a/javascript/TinyMCEImageEnhancement.js
+++ b/javascript/TinyMCEImageEnhancement.js
@@ -5,7 +5,7 @@
 TinyMCEImageEnhancement = Class.create();
 TinyMCEImageEnhancement.prototype = {
     initialize: function() {
-        this.filesUploaed = 0;
+        this.filesUploaded = 0;
         this.processInProgress = false;
         Event.observe(window,'load',this.onWindowLoad.bind(this));
     },
@@ -130,7 +130,18 @@ TinyMCEImageEnhancement.prototype = {
      * Called on window.onload
     */
     
-    onWindowLoad: function() {
+    onWindowLoad: function() {
+        // Due to a bug in the flash plugin on Linux and Mac, we need at least version 9.0.64 to use SWFUpload
+        if(navigator.appVersion.indexOf("Mac") != -1 || navigator.appVersion.indexOf("X11") != -1 || navigator.appVersion.indexOf("Linux") != -1) {
+           pv = getFlashPlayerVersion();
+           if(pv.major < 9 || (pv.major == 9 && pv.minor == 0 && pv.rev < 64)) {
+              $('AddFolderGroup').style.display = 'none';
+              $('PipeSeparator').style.display = 'none';
+              $('UploadGroup').style.display = 'none';
+              return;
+           }
+        }
+    
         if($('FolderID') != null) {
 	        this.upload = new Upload(
 	            {