diff --git a/wp-includes/post.php b/wp-includes/post.php
index c703d116e8..0983bab992 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -1365,12 +1365,13 @@ function wp_delete_attachment($postid) {
 	$meta = wp_get_attachment_metadata( $postid );
 	$file = get_attached_file( $postid );
 
+	// TODO delete for pluggable post taxonomies too
+	wp_delete_object_term_relationships($postid, array('category', 'post_tag'));
+
 	$wpdb->query("DELETE FROM $wpdb->posts WHERE ID = '$postid'");
 
 	$wpdb->query("DELETE FROM $wpdb->comments WHERE comment_post_ID = '$postid'");
 
-	$wpdb->query("DELETE FROM $wpdb->post2cat WHERE post_id = '$postid'");
-
 	$wpdb->query("DELETE FROM $wpdb->postmeta WHERE post_id = '$postid'");
 
 	if ( ! empty($meta['thumb']) ) {