diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 027edd0831..f01f594331 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -167,7 +167,7 @@ function get_attachment_link($id = false) {
 		else
 			$parentlink = get_permalink( $object->post_parent );
 		if (strpos($parentlink, '?') === false)
-			$link = trim($parentlink, '/') . '/' . $object->post_name . '/';
+			$link = trailingslashit($parentlink) . $object->post_name . '/';
 	}
 
 	if (! $link ) {