diff --git a/CHANGELOG b/CHANGELOG
index ec353e9..643b69b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Apply the workaround for the Firefox "blinking element" opacity=1 bug only to Firefox 1.5.  [Thomas Fuchs]
+
 * Add event.stopped, a boolean that is set to `true` when Event#stop is called. [Andrew Dupont, sam]
 
 * Reset the browser's dimensions to their original settings after running the DOM viewport tests.  [sam]
diff --git a/src/dom.js b/src/dom.js
index 1512459..a3d24e2 100644
--- a/src/dom.js
+++ b/src/dom.js
@@ -847,7 +847,7 @@ else if (Prototype.Browser.IE) {
   })(Element._attributeTranslations.read.values);
 }
 
-else if (Prototype.Browser.Gecko) {
+else if (Prototype.Browser.Gecko && /rv:1\.8\.0/.test(navigator.userAgent)) {
   Element.Methods.setOpacity = function(element, value) {
     element = $(element);
     element.style.opacity = (value == 1) ? 0.999999 :