diff --git i/wp-includes/link-template.php w/wp-includes/link-template.php
index 7197549..a0167eb 100644
--- i/wp-includes/link-template.php
+++ w/wp-includes/link-template.php
@@ -200,7 +200,7 @@ function get_post_permalink( $id = 0, $leavename = false, $sample = false ) {
 		$post_link = home_url( user_trailingslashit($post_link) );
 	} else {
 		if ( $post_type->query_var && ( isset($post->post_status) && !$draft_or_pending ) )
-			$post_link = add_query_arg($post_type->query_var, $slug, '');
+			$post_link = add_query_arg($post_type->query_var, '%postname%', '');
 		else
 			$post_link = add_query_arg(array('post_type' => $post->post_type, 'p' => $post->ID), '');
 		$post_link = home_url($post_link);