diff --git a/DESCRIPTION b/DESCRIPTION
index 585a51285a..c1570b7c4d 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -135,6 +135,7 @@ Collate:
     'geom-abline.R'
     'geom-rect.R'
     'geom-bar.R'
+    'geom-tile.R'
     'geom-bin2d.R'
     'geom-blank.R'
     'geom-boxplot.R'
@@ -167,7 +168,6 @@ Collate:
     'geom-smooth.R'
     'geom-spoke.R'
     'geom-text.R'
-    'geom-tile.R'
     'geom-violin.R'
     'geom-vline.R'
     'ggplot2-package.R'
diff --git a/NAMESPACE b/NAMESPACE
index 63bee440fc..67649360da 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -172,6 +172,7 @@ export(GeomAbline)
 export(GeomAnnotationMap)
 export(GeomArea)
 export(GeomBar)
+export(GeomBin2d)
 export(GeomBlank)
 export(GeomBoxplot)
 export(GeomCol)
diff --git a/R/geom-bin2d.R b/R/geom-bin2d.R
index 2fe756dc96..5a143df51d 100644
--- a/R/geom-bin2d.R
+++ b/R/geom-bin2d.R
@@ -1,3 +1,6 @@
+#' @include geom-tile.R
+NULL
+
 #' Heatmap of 2d bin counts
 #'
 #' Divides the plane into rectangles, counts the number of cases in
@@ -37,7 +40,7 @@ geom_bin_2d <- function(mapping = NULL, data = NULL,
     data = data,
     mapping = mapping,
     stat = stat,
-    geom = GeomTile,
+    geom = GeomBin2d,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
@@ -53,3 +56,8 @@ geom_bin_2d <- function(mapping = NULL, data = NULL,
 #' @usage NULL
 geom_bin2d <- geom_bin_2d
 
+#' @rdname ggplot2-ggproto
+#' @format NULL
+#' @usage NULL
+#' @export
+GeomBin2d <- ggproto("GeomBin2d", GeomTile)
diff --git a/man/ggplot2-ggproto.Rd b/man/ggplot2-ggproto.Rd
index 963df0278c..602ce35e4f 100644
--- a/man/ggplot2-ggproto.Rd
+++ b/man/ggplot2-ggproto.Rd
@@ -5,14 +5,14 @@
 %   R/coord-cartesian-.R, R/coord-fixed.R, R/coord-flip.R, R/coord-map.R,
 %   R/coord-polar.R, R/coord-quickmap.R, R/coord-radial.R, R/coord-transform.R,
 %   R/facet-.R, R/facet-grid-.R, R/facet-null.R, R/facet-wrap.R, R/stat-.R,
-%   R/geom-abline.R, R/geom-rect.R, R/geom-bar.R, R/geom-blank.R,
-%   R/geom-boxplot.R, R/geom-col.R, R/geom-path.R, R/geom-contour.R,
-%   R/geom-crossbar.R, R/geom-segment.R, R/geom-curve.R, R/geom-ribbon.R,
-%   R/geom-density.R, R/geom-density2d.R, R/geom-dotplot.R, R/geom-errorbar.R,
-%   R/geom-function.R, R/geom-hex.R, R/geom-hline.R, R/geom-label.R,
-%   R/geom-linerange.R, R/geom-point.R, R/geom-pointrange.R, R/geom-quantile.R,
-%   R/geom-rug.R, R/geom-smooth.R, R/geom-spoke.R, R/geom-text.R,
-%   R/geom-tile.R, R/geom-violin.R, R/geom-vline.R, R/guide-.R, R/guide-axis.R,
+%   R/geom-abline.R, R/geom-rect.R, R/geom-bar.R, R/geom-tile.R, R/geom-bin2d.R,
+%   R/geom-blank.R, R/geom-boxplot.R, R/geom-col.R, R/geom-path.R,
+%   R/geom-contour.R, R/geom-crossbar.R, R/geom-segment.R, R/geom-curve.R,
+%   R/geom-ribbon.R, R/geom-density.R, R/geom-density2d.R, R/geom-dotplot.R,
+%   R/geom-errorbar.R, R/geom-function.R, R/geom-hex.R, R/geom-hline.R,
+%   R/geom-label.R, R/geom-linerange.R, R/geom-point.R, R/geom-pointrange.R,
+%   R/geom-quantile.R, R/geom-rug.R, R/geom-smooth.R, R/geom-spoke.R,
+%   R/geom-text.R, R/geom-violin.R, R/geom-vline.R, R/guide-.R, R/guide-axis.R,
 %   R/guide-axis-logticks.R, R/guide-axis-stack.R, R/guide-axis-theta.R,
 %   R/guide-legend.R, R/guide-bins.R, R/guide-colorbar.R, R/guide-colorsteps.R,
 %   R/guide-custom.R, R/guide-none.R, R/guide-old.R, R/layout.R, R/position-.R,
@@ -55,6 +55,8 @@
 \alias{GeomAbline}
 \alias{GeomRect}
 \alias{GeomBar}
+\alias{GeomTile}
+\alias{GeomBin2d}
 \alias{GeomBlank}
 \alias{GeomBoxplot}
 \alias{GeomCol}
@@ -86,7 +88,6 @@
 \alias{GeomSmooth}
 \alias{GeomSpoke}
 \alias{GeomText}
-\alias{GeomTile}
 \alias{GeomViolin}
 \alias{GeomVline}
 \alias{Guide}