diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml
index f32a9e945b5e0..4d9a92d4bb7c6 100644
--- a/administrator/components/com_content/config.xml
+++ b/administrator/components/com_content/config.xml
@@ -1050,6 +1050,27 @@
 			<option value="0">JNO</option>
 		</field>
 
+		<field
+			name="custom_fields_base_context"
+			type="hidden"
+			default="com_content.article"
+		/>
+
+		<field
+			name="custom_fields_enabled_contexts"
+			type="list"
+			multiple="multiple"
+			label="JGLOBAL_CUSTOM_FIELDS_ENABLED_CONTEXTS_LABEL"
+			description="JGLOBAL_CUSTOM_FIELDS_ENABLED_CONTEXTS_DESC"
+			default="com_content.article"
+			showon="custom_fields_enable:1"
+		>
+			<option value="com_content.article">COM_CONTENT_ARTICLE_VIEW</option>
+			<option value="com_content.featured">COM_CONTENT_FEATURED_VIEW</option>
+			<option value="com_content.category">COM_CONTENT_CATEGORY_VIEW</option>
+			<option value="com_content.archive">COM_CONTENT_ARCHIVE_VIEW</option>
+		</field>
+
 	</fieldset>
 
 	<fieldset
diff --git a/administrator/language/en-GB/en-GB.com_content.ini b/administrator/language/en-GB/en-GB.com_content.ini
index edc6ce87e787e..9a30fabe83513 100644
--- a/administrator/language/en-GB/en-GB.com_content.ini
+++ b/administrator/language/en-GB/en-GB.com_content.ini
@@ -7,8 +7,10 @@ COM_CONTENT="Articles"
 COM_CONTENT_ACCESS_DELETE_DESC="New setting for <strong>delete actions</strong> on this article and the calculated setting based on the parent category and group permissions."
 COM_CONTENT_ACCESS_EDIT_DESC="New setting for <strong>edit actions</strong> on this article and the calculated setting based on the parent category and group permissions."
 COM_CONTENT_ACCESS_EDITSTATE_DESC="New setting for <strong>edit state actions</strong> on this article and the calculated setting based on the parent category and group permissions."
+COM_CONTENT_ARCHIVE_VIEW="Archive view"
 COM_CONTENT_ARTICLE_CONTENT="Content"
 COM_CONTENT_ARTICLE_DETAILS="Article Details"
+COM_CONTENT_ARTICLE_VIEW="Single article view"
 COM_CONTENT_ARTICLES_TITLE="Articles"
 COM_CONTENT_ATTRIBS_ARTICLE_SETTINGS_LABEL="Options"
 COM_CONTENT_ATTRIBS_FIELDSET_LABEL="Options"
@@ -16,6 +18,7 @@ COM_CONTENT_ATTRIBS_FIELDSET_LABEL="Options"
 COM_CONTENT_BATCH_MENU_LABEL="To Move or Copy your selection please select a Category."
 COM_CONTENT_BATCH_OPTIONS="Batch process the selected articles"
 COM_CONTENT_BATCH_TIP="If a category is selected for move/copy, any actions selected will be applied to the copied or moved articles. Otherwise, all actions are applied to the selected articles."
+COM_CONTENT_CATEGORY_VIEW="Category view"
 COM_CONTENT_CHANGE_ARTICLE="Select or Change article"
 COM_CONTENT_CHANGE_ARTICLE_BUTTON="Select/Change"
 COM_CONTENT_CHOOSE_CATEGORY_DESC="Select a parent category."
@@ -45,6 +48,7 @@ COM_CONTENT_FEATURED_CATEGORIES_DESC="Optional list of categories. If selected,
 COM_CONTENT_FEATURED_CATEGORIES_LABEL="Select Categories"
 COM_CONTENT_FEATURED_ORDER="Featured Articles Order"
 COM_CONTENT_FEATURED_TITLE="Articles: Featured"
+COM_CONTENT_FEATURED_VIEW="Featured article view"
 COM_CONTENT_FIELD_BROWSER_PAGE_TITLE_DESC="Optional text for the &quot;Browser page title&quot; element to be used when the article is viewed with a non-article menu item. If blank, the article's title is used instead."
 COM_CONTENT_FIELD_BROWSER_PAGE_TITLE_LABEL="Browser Page Title"
 COM_CONTENT_FIELD_ARTICLETEXT_DESC="Enter the article content in the text area."
diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini
index 4e0f80f60383f..f878396bb699f 100644
--- a/administrator/language/en-GB/en-GB.ini
+++ b/administrator/language/en-GB/en-GB.ini
@@ -500,6 +500,8 @@ JGLOBAL_SEF_NOIDS_DESC="Remove the IDs from the URLs of this component."
 JGLOBAL_SEF_NOIDS_LABEL="Remove IDs from URLs"
 JGLOBAL_CUSTOM_FIELDS_ENABLE_DESC="Enable the creation of custom fields."
 JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL="Enable Custom Fields"
+JGLOBAL_CUSTOM_FIELDS_ENABLED_CONTEXTS_LABEL="Where should custom fields appear"
+JGLOBAL_CUSTOM_FIELDS_ENABLED_CONTEXTS_DESC="Select one or more output views where custom fields should appear"
 JGLOBAL_SELECT_ALLOW_DENY_GROUP="Change %s permission for %s group."
 JGLOBAL_SELECT_AN_OPTION="Select an option"
 JGLOBAL_SELECT_NO_RESULTS_MATCH="No results match"
diff --git a/plugins/system/fields/fields.php b/plugins/system/fields/fields.php
index 41db723f8bf41..aab90b60511a8 100644
--- a/plugins/system/fields/fields.php
+++ b/plugins/system/fields/fields.php
@@ -389,6 +389,33 @@ private function display($context, $item, $params, $displayType)
 
 		$context = $parts[0] . '.' . $parts[1];
 
+		if (strpos($parts[0], 'com_') === 0)
+		{
+			$compParams = JComponentHelper::getParams($parts[0]);
+
+			// Should check if we want the custom fields displayed
+			if (!$compParams->get('custom_fields_enable', 1))
+			{
+				return;
+			}
+
+			$customFieldsEnabledContexts = $compParams->get('custom_fields_enabled_contexts', '');
+
+			if (is_array($customFieldsEnabledContexts))
+			{
+				if (in_array($parts[0] . '.' . $parts[1], $customFieldsEnabledContexts))
+				{
+					$context = $compParams->get('custom_fields_base_context', $context);
+					$parts   = FieldsHelper::extract($context);                        
+				}
+				else
+				{
+					// We have no contexts within which to show custom fields
+					return;
+				}
+			}
+		}
+
 		if (is_string($params) || !$params)
 		{
 			$params = new Registry($params);
@@ -446,6 +473,33 @@ public function onContentPrepare($context, $item)
 			return;
 		}
 
+		if (strpos($parts[0], 'com_') === 0)
+		{
+			$compParams = JComponentHelper::getParams($parts[0]);
+
+			// Should check if we want the custom fields displayed
+			if (!$compParams->get('custom_fields_enable', 1))
+			{
+				return;
+			}
+
+			$customFieldsEnabledContexts = $compParams->get('custom_fields_enabled_contexts', '');
+
+			if (is_array($customFieldsEnabledContexts))
+			{
+				if (in_array($parts[0] . '.' . $parts[1], $customFieldsEnabledContexts))
+				{
+					$context = $compParams->get('custom_fields_base_context', $context);
+					$parts   = FieldsHelper::extract($context);                        
+				}
+				else
+				{
+					// We have no contexts within which to show custom fields
+					return;
+				}                        
+			}
+		}
+
 		$fields = FieldsHelper::getFields($parts[0] . '.' . $parts[1], $item, true);
 
 		// Adding the fields to the object