diff --git a/jdk/src/share/classes/sun/font/FileFontStrike.java b/jdk/src/share/classes/sun/font/FileFontStrike.java
index edc9e67b6cbc47107f503148ff732fdf95fdaee9..79890d400ec0f7292c53980f997be604fc105159 100644
--- a/jdk/src/share/classes/sun/font/FileFontStrike.java
+++ b/jdk/src/share/classes/sun/font/FileFontStrike.java
@@ -217,7 +217,12 @@ public class FileFontStrike extends PhysicalStrike {
          * "maximumSizeForGetImageWithAdvance".
          * This should be no greater than OutlineTextRender.THRESHOLD.
          */
-        getImageWithAdvance = at.getScaleY() <= 48.0;
+        double maxSz = 48.0;
+        getImageWithAdvance =
+            Math.abs(at.getScaleX()) <= maxSz &&
+            Math.abs(at.getScaleY()) <= maxSz &&
+            Math.abs(at.getShearX()) <= maxSz &&
+            Math.abs(at.getShearY()) <= maxSz;
 
         /* Some applications request advance frequently during layout.
          * If we are not getting and caching the image with the advance,
diff --git a/jdk/test/java/awt/font/Rotate/Shear.java b/jdk/test/java/awt/font/Rotate/Shear.java
new file mode 100644
index 0000000000000000000000000000000000000000..5b109b40d5d87d6ba4411cd377c75f90ae22989a
--- /dev/null
+++ b/jdk/test/java/awt/font/Rotate/Shear.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6692979
+ * @summary Verify no crashes with extreme shears.
+ */
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.font.*;
+import java.awt.geom.*;
+public class Shear extends Component {
+
+    public static void main(String[] args) {
+        JFrame f = new JFrame();
+        f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        f.getContentPane().add("Center", new Shear());
+        f.pack();
+        f.setVisible(true);
+    }
+
+    public Dimension getPreferredSize() {
+      return new Dimension(400,300);
+    }
+
+    public void paint(Graphics g) {
+        Graphics2D g2 = (Graphics2D)g;
+
+        g.setColor(Color.white);
+        g.fillRect(0,0,400,300);
+        g.setColor(Color.black);
+        Font origFont = new Font(Font.DIALOG, Font.BOLD, 30);
+        for (int i=0;i<=360;i++) {
+            double sv = i*180.0/Math.PI;
+            AffineTransform tx = AffineTransform.getShearInstance(sv, sv);
+            Font font = origFont.deriveFont(tx);
+            g.setFont(font);
+            GlyphVector gv =
+                  font.createGlyphVector(g2.getFontRenderContext(), "JavaFX");
+            //System.out.println(gv.getVisualBounds());
+            g.drawString("JavaFX", 100, 100);
+        }
+    }
+}