Ticket #23302: 23302.patch

wp-includes/post.php

@@ -1270 +1270 @@
                                 add_rewrite_rule( "{$archive_slug}/{$wp_rewrite->pagination_base}/([0-9]{1,})/?$", "index.php?post_type=$post_type" . '&paged=$matches[1]', 'top' );
                 }
 
-                add_permastruct( $post_type, "{$args->rewrite['slug']}/%$post_type%", $args->rewrite );
+                add_permastruct( $post_type, "{$args->rewrite['slug']}/%$post_type%", array_merge( $args->rewrite, array( 'feed' => $args->rewrite['feeds'] ) ) );
         }
 
         if ( $args->register_meta_box_cb )