apply changes by Archaeopteryx [:aryx]

see https://bugzilla.mozilla.org/attachment.cgi?id=830462