Index: wp-includes/rewrite.php
===================================================================
--- wp-includes/rewrite.php	(revision 19753)
+++ wp-includes/rewrite.php	(working copy)
@@ -200,11 +200,25 @@
 define('EP_PAGES', 4096);
 
 /**
+ * Endpoint Mask for custom post type archives. 
+ *
+ * @since 3.4.0
+ */
+define( 'EP_CPT_ARCHIVE', 8192 );
+
+/**
+ * Endpoint Mask for all archive views.
+ *
+ * @since 3.4.0
+ */
+define( 'EP_ALL_ARCHIVES', EP_DATE | EP_YEAR | EP_MONTH | EP_DAY | EP_CATEGORIES | EP_TAGS | EP_AUTHORS | EP_CPT_ARCHIVE );
+
+/**
  * Endpoint Mask for everything.
  *
  * @since 2.1.0
  */
-define('EP_ALL', 8191);
+define( 'EP_ALL', EP_PERMALINK | EP_ATTACHMENT | EP_ROOT | EP_COMMENTS | EP_SEARCH | EP_PAGES | EP_ALL_ARCHIVES );
 
 /**
  * Add an endpoint, like /trackback/.