diff --git a/CHANGES.txt b/CHANGES.txt
index f6ac1fd..a532184 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,10 @@ Changelog
 2.0.5 (Unreleased)
 ------------------
 
+- Simplify CSS and JS registrations. CSS will now be imported using the
+  standard link and so can be merged.
+  [elro]
+
 - Enable the left-menu on the configlet, to be more consistent with all other configlets.
   Related to https://dev.plone.org/plone/ticket/11737
   [WouterVH]
diff --git a/plone/app/discussion/profiles/default/cssregistry.xml b/plone/app/discussion/profiles/default/cssregistry.xml
index 348813b..1f56022 100644
--- a/plone/app/discussion/profiles/default/cssregistry.xml
+++ b/plone/app/discussion/profiles/default/cssregistry.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0"?>
 <object name="portal_css">
- <stylesheet title=""
-    id="++resource++plone.app.discussion.stylesheets/discussion.css"
-    media="screen" rel="stylesheet" rendering="import"
-    cacheable="True" compression="safe" cookable="False"
-    enabled="1" expression=""/>
+ <stylesheet id="++resource++plone.app.discussion.stylesheets/discussion.css"/>
 </object>
diff --git a/plone/app/discussion/profiles/default/jsregistry.xml b/plone/app/discussion/profiles/default/jsregistry.xml
index 3372791..6f1e65e 100644
--- a/plone/app/discussion/profiles/default/jsregistry.xml
+++ b/plone/app/discussion/profiles/default/jsregistry.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0"?>
 <object name="portal_javascripts">
- <javascript
-     id="++resource++plone.app.discussion.javascripts/comments.js"
-     cacheable="True" compression="safe" cookable="True"
-     enabled="True" expression="" inline="False"
-     />
+ <javascript id="++resource++plone.app.discussion.javascripts/comments.js"/>
 </object>