diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 029aa2bd88..c12fb1f40e 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -179,8 +179,12 @@ function get_attachment_link($id = false) {
 			$parentlink = _get_page_link( $object->post_parent ); // Ignores page_on_front
 		else
 			$parentlink = get_permalink( $object->post_parent );
+		if ( ctype_digit($object->post_name) )
+			$name = 'attachment/' . $object->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker
+		else
+			$name = $object->post_name;
 		if (strpos($parentlink, '?') === false)
-			$link = trailingslashit($parentlink) . $object->post_name . '/';
+			$link = trailingslashit($parentlink) . $name . '/';
 	}
 
 	if (! $link ) {