diff --git a/wp-includes/post.php b/wp-includes/post.php
index 4354270e0cfd016272c003b86b880781ea788991..5d56c45c994e1cdbd8a25d95fe25e95661578e95 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -1213,6 +1213,15 @@ function register_post_type( $post_type, $args = array() ) {
 		'_builtin'             => false,
 		'_edit_link'           => 'post.php?post=%d',
 	);
+	
+	// Allow filtering of all arguments for non built-in post types
+	if( $args['_builtin'] == false ){
+		$args = apply_filters( 'register_post_type_args', $args, $post_type ); 
+	}
+
+	// Allow filtering of labels for all post types
+	$args['labels'] = apply_filters( 'register_post_type_labels', $args['labels'], $post_type ); 
+
 	$args = wp_parse_args( $args, $defaults );
 	$args = (object) $args;