Index: wp-admin/includes/meta-boxes.php
===================================================================
--- wp-admin/includes/meta-boxes.php	(revision 15375)
+++ wp-admin/includes/meta-boxes.php	(working copy)
@@ -15,6 +15,7 @@
 	$post_type = $post->post_type;
 	$post_type_object = get_post_type_object($post_type);
 	$can_publish = current_user_can($post_type_object->cap->publish_posts);
+        $post_type_supports_stickies = ( $post_type == 'post' || post_type_supports( $post_type, 'sticky') );
 ?>
 <div class="submitbox" id="submitpost">
 
@@ -116,7 +117,7 @@
 } elseif ( !empty( $post->post_password ) ) {
 	$visibility = 'password';
 	$visibility_trans = __('Password protected');
-} elseif ( $post_type == 'post' && is_sticky( $post->ID ) ) {
+} elseif ( $post_type_supports_stickies && is_sticky( $post->ID ) ) {
 	$visibility = 'public';
 	$visibility_trans = __('Public, Sticky');
 } else {
@@ -130,15 +131,15 @@
 
 <div id="post-visibility-select" class="hide-if-js">
 <input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo esc_attr($post->post_password); ?>" />
-<?php if ($post_type == 'post'): ?>
+<?php if ( $post_type_supports_stickies ): ?>
 <input type="checkbox" style="display:none" name="hidden_post_sticky" id="hidden-post-sticky" value="sticky" <?php checked(is_sticky($post->ID)); ?> />
 <?php endif; ?>
 <input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo esc_attr( $visibility ); ?>" />
 
 
 <input type="radio" name="visibility" id="visibility-radio-public" value="public" <?php checked( $visibility, 'public' ); ?> /> <label for="visibility-radio-public" class="selectit"><?php _e('Public'); ?></label><br />
-<?php if ($post_type == 'post'): ?>
-<span id="sticky-span"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked(is_sticky($post->ID)); ?> tabindex="4" /> <label for="sticky" class="selectit"><?php _e('Stick this post to the front page') ?></label><br /></span>
+<?php if ( $post_type_supports_stickies ): ?>
+<span id="sticky-span"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked(is_sticky($post->ID)); ?> tabindex="4" /> <label for="sticky" class="selectit"><?php _e('Stick this '. $post->post_type .' to the front page') ?></label><br /></span>
 <?php endif; ?>
 <input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked( $visibility, 'password' ); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e('Password protected'); ?></label><br />
 <span id="password-span"><label for="post_password"><?php _e('Password:'); ?></label> <input type="text" name="post_password" id="post_password" value="<?php echo esc_attr($post->post_password); ?>" /><br /></span>
Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 15375)
+++ wp-admin/includes/template.php	(working copy)
@@ -1111,7 +1111,7 @@
 				</select>
 			</label>
 
-<?php if ( 'post' == $screen->post_type && $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>
+<?php if ( ('post' == $screen->post_type || post_type_supports( $screen->post_type, 'sticky') )&& $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>
 
 <?php	if ( $bulk ) : ?>
 
@@ -1128,7 +1128,7 @@
 
 			<label class="alignleft">
 				<input type="checkbox" name="sticky" value="sticky" />
-				<span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span>
+				<span class="checkbox-title"><?php _e( 'Make this '.$screen->post_type.' sticky' ); ?></span>
 			</label>
 
 <?php	endif; // $bulk ?>
