diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index 1d98142..4fc7052 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -4,7 +4,9 @@ Changelog
 2.1.2 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Merged Rafael Oliveira's (@rafaelbco) @content-core views from
+  collective.cmfeditionsdexteritycompat.
+  [rpatterson]
 
 
 2.1.1 (2013-01-17)
diff --git a/plone/dexterity/browser/configure.zcml b/plone/dexterity/browser/configure.zcml
index f2ee78d..cd6b541 100644
--- a/plone/dexterity/browser/configure.zcml
+++ b/plone/dexterity/browser/configure.zcml
@@ -12,6 +12,24 @@
         permission="zope2.View"
         />
     
+    <!-- Content core views -->
+
+    <browser:page
+        for="..interfaces.IDexterityItem"
+        name="content-core"
+        class=".view.DefaultView"
+        template="itemcontentcore.pt"
+        permission="zope2.View"
+        />
+
+    <browser:page
+        for="..interfaces.IDexterityContainer"
+        name="content-core"
+        class=".view.DefaultView"
+        template="containercontentcore.pt"
+        permission="zope2.View"
+        />
+
     <!-- Standard IPublishTraverse adapter -->
     <adapter factory=".traversal.DexterityPublishTraverse" />
     
diff --git a/plone/dexterity/browser/containercontentcore.pt b/plone/dexterity/browser/containercontentcore.pt
new file mode 100644
index 0000000..911012a
--- /dev/null
+++ b/plone/dexterity/browser/containercontentcore.pt
@@ -0,0 +1,28 @@
+<metal:content-core define-macro="content-core">
+
+  <tal:block repeat="widget view/widgets/values">
+      <div class="field" tal:condition="python:widget.__name__ not in ('IBasic.title', 'IBasic.description', 'title', 'description',)">
+          <label tal:content="widget/label" />
+          <br />
+          <div tal:content="structure widget/render" />
+      </div>
+  </tal:block>
+          
+  <fieldset tal:repeat="group view/groups"
+            tal:attributes="id python:''.join((group.prefix, 'groups.', group.__name__)).replace('.', '-')">
+      <legend tal:content="group/label" />
+      <div class="field" tal:repeat="widget group/widgets/values">
+          <label tal:content="widget/label" />
+          <br />
+          <div tal:content="structure widget/render" />
+      </div>
+  </fieldset>
+  
+  <fieldset id="folder-listing">
+      <legend>Contents</legend>
+      <tal:block define="listing_macro context/folder_listing/macros/listing">
+          <metal:use_macro use-macro="listing_macro" />
+      </tal:block>
+  </fieldset>
+
+</metal:content-core>
diff --git a/plone/dexterity/browser/itemcontentcore.pt b/plone/dexterity/browser/itemcontentcore.pt
new file mode 100644
index 0000000..6e453b6
--- /dev/null
+++ b/plone/dexterity/browser/itemcontentcore.pt
@@ -0,0 +1,21 @@
+<metal:content-core define-macro="content-core">
+
+  <tal:block repeat="widget view/widgets/values">
+      <div class="field" tal:condition="python:widget.__name__ not in ('IBasic.title', 'IBasic.description', 'title', 'description',)">
+          <label tal:content="widget/label" />
+          <br />
+          <div tal:content="structure widget/render" />
+      </div>
+  </tal:block>
+          
+  <fieldset tal:repeat="group view/groups"
+            tal:attributes="id python:''.join((group.prefix, 'groups.', group.__name__)).replace('.', '-')">
+      <legend tal:content="group/label" />
+      <div class="field" tal:repeat="widget group/widgets/values">
+          <label tal:content="widget/label" />
+          <br />
+          <div tal:content="structure widget/render" />
+      </div>
+  </fieldset>
+
+</metal:content-core>