diff --git a/doc-src/content/CHANGELOG.markdown b/doc-src/content/CHANGELOG.markdown
index 1f3e47f7..5da006f1 100644
--- a/doc-src/content/CHANGELOG.markdown
+++ b/doc-src/content/CHANGELOG.markdown
@@ -7,6 +7,12 @@ layout: article
 COMPASS CHANGELOG
 =================
 
+0.10.0.rc6 (Unreleased)
+-----------------------
+* [Compass Core] The configuration constant `$firefox2-ellipsis` has been
+  renamed to `$use-mozilla-ellipsis-binding` to reflect the fact that
+  it must be used for any version of mozilla less than 3.6.
+
 0.10.0.rc5 (May 2, 2010)
 ------------------------
 
diff --git a/frameworks/compass/stylesheets/compass/utilities/text/_ellipsis.scss b/frameworks/compass/stylesheets/compass/utilities/text/_ellipsis.scss
index 1d4b0182..3b3db25d 100644
--- a/frameworks/compass/stylesheets/compass/utilities/text/_ellipsis.scss
+++ b/frameworks/compass/stylesheets/compass/utilities/text/_ellipsis.scss
@@ -1,9 +1,9 @@
 @import "compass/css3/shared";
 
-// To get firefox2 support, you must install the ellipsis pattern:
+// To get full firefox support, you must install the ellipsis pattern:
 //
 //     compass install compass/ellipsis
-$firefox2-ellipsis: false !default;
+$use-mozilla-ellipsis-binding: false !default;
 
 // This technique, by [Justin Maxwell](http://code404.com/), was originally
 // published [here](http://mattsnider.com/css/css-string-truncation-with-ellipsis/).
@@ -19,7 +19,7 @@ $firefox2-ellipsis: false !default;
     not -khtml,
     official
   );
-  @if $experimental-support-for-mozilla and $firefox2-ellipsis {
+  @if $experimental-support-for-mozilla and $use-mozilla-ellipsis-binding {
     -moz-binding: stylesheet-url(unquote("xml/ellipsis.xml#ellipsis"));    
   }
 }
diff --git a/frameworks/compass/templates/ellipsis/ellipsis.sass b/frameworks/compass/templates/ellipsis/ellipsis.sass
index 2e44f702..6285df65 100644
--- a/frameworks/compass/templates/ellipsis/ellipsis.sass
+++ b/frameworks/compass/templates/ellipsis/ellipsis.sass
@@ -1,6 +1,6 @@
-// Since you've installed the xml file, you must set
-// $firefox2-ellipsis to true before importing.
-$firefox2-ellipsis: true
+// Since you've installed the xml file, you should set
+// $use-mozilla-ellipsis-binding to true before importing.
+$use-mozilla-ellipsis-binding: true
 @import compass/utilities/text/ellipsis
 
 // You can delete this sass file if you want, it's just an example of how to use the ellipsis mixin.