@@ -0,0 +1,5 @@
+``Axes3D`` now preserves right angles when rotating
+---------------------------------------------------
+
+:class:`~mpl_toolkits.mplot3d.Axes3D` no longer stretches the plot in the x
+axis after projecting.
@@ -1467,9 +1467,9 @@ def apply_aspect(self, position=None):
         """
         Adjust the Axes for a specified data aspect ratio.
 
-        Depending on `.get_adjustable` this will modify either the Axes box
-        (position) or the view limits. In the former case, `.get_anchor`
-        will affect the position.
+        Depending on `.get_adjustable` this will modify either the
+        Axes box (position) or the view limits. In the former case,
+        `~matplotlib.axes.Axes.get_anchor` will affect the position.
 
         Notes
         -----
 
@@ -265,6 +265,20 @@ def tunit_edges(self, vals=None, M=None):
                  (tc[7], tc[4])]
         return edges
 
+    def apply_aspect(self, position=None):
+        if position is None:
+            position = self.get_position(original=True)
+
+        # in the superclass, we would go through and actually deal with axis
+        # scales and box/datalim. Those are all irrelevant - all we need to do
+        # is make sure our coordinate system is square.
+        figW, figH = self.get_figure().get_size_inches()
+        fig_aspect = figH / figW
+        box_aspect = 1
+        pb = position.frozen()
+        pb1 = pb.shrunk_to_aspect(box_aspect, pb, fig_aspect)
+        self.set_position(pb1.anchored(self.get_anchor(), pb), 'active')
+
     @artist.allow_rasterization
     def draw(self, renderer):
         # draw the background patch
 
@@ -478,6 +478,13 @@ def test_axes3d_cla():
     ax.cla()  # make sure the axis displayed is 3D (not 2D)
 
 
+@image_comparison(['axes3d_rotated.png'])
+def test_axes3d_rotated():
+    fig = plt.figure()
+    ax = fig.add_subplot(1, 1, 1, projection='3d')
+    ax.view_init(90, 45)  # look down, rotated. Should be square
+
+
 def test_plotsurface_1d_raises():
     x = np.linspace(0.5, 10, num=100)
     y = np.linspace(0.5, 10, num=100)