diff --git a/doc-src/content/CHANGELOG.markdown b/doc-src/content/CHANGELOG.markdown
index f620c1ac..57215217 100644
--- a/doc-src/content/CHANGELOG.markdown
+++ b/doc-src/content/CHANGELOG.markdown
@@ -14,6 +14,12 @@ The Documentation for the [latest stable release](http://compass-style.org/docs/
 
 The Documentation for the [latest preview release](http://beta.compass-style.org/)
 
+0.11.beta.2 (02/01/2011)
+------------------------
+* Updated the font-face mixin so it works in Android 2.2.
+  Credit: [Paul Irish](http://paulirish.com/).
+* The deprecated & unused arguments to the font-face mixin have been removed.
+
 0.11.beta.1 (01/17/2011)
 ------------------------
 * Add an option `--skip-overrides` to the sprite
diff --git a/frameworks/compass/stylesheets/compass/css3/_font-face.scss b/frameworks/compass/stylesheets/compass/css3/_font-face.scss
index c8274cf4..445dff16 100644
--- a/frameworks/compass/stylesheets/compass/css3/_font-face.scss
+++ b/frameworks/compass/stylesheets/compass/css3/_font-face.scss
@@ -7,15 +7,17 @@
 // * $font-files is required using font-files('relative/location', 'format').
 //   for best results use this order: woff, opentype/truetype, svg
 // * $eot is required by IE, and is a relative location of the eot file.
+// * For android 2.2 Compatiblity, please ensure that your web page has
+//   a meta viewport tag.
+// * To support iOS < 4.2, an SVG file must be provided
+//
+// If you need to generate other formats check out the Font Squirrel
+// [font generator](http://www.fontsquirrel.com/fontface/generator)
 
-@mixin font-face($name, $font-files, $eot: false, $postscript: false, $style: false) {
-  @if $postscript or $style {
-    @warn "The $postscript and $style variables have been deprecated in favor of the Paul Irish smiley bulletproof technique.";
-  }
+@mixin font-face($name, $font-files, $eot: false) {
   @font-face {
     font-family: quote($name);
-    @if $eot {
-      src: font-url($eot); }
+    @if $eot { src: font-url($eot); }
     src: local("☺"), $font-files; 
   }
   @media screen and (max-device-width: 480px) {