diff --git a/CHANGES.rst b/CHANGES.rst
index 0bfa99ba1..da366b40b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-\ (unreleased)
+3.2.0 (unreleased)
 --------------
 
 Breaking changes:
@@ -14,7 +14,8 @@ New features:
 
 Bug fixes:
 
-- *add item here*
+- Update plone.app.event resources. Requires plonetheme.barceloneta >= 1.8.2
+  [agitator]
 
 
 3.1.1 (2018-06-04)
diff --git a/plone/app/event/browser/configure.zcml b/plone/app/event/browser/configure.zcml
index eb265ccaf..15ebfb19f 100644
--- a/plone/app/event/browser/configure.zcml
+++ b/plone/app/event/browser/configure.zcml
@@ -1,14 +1,14 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser"
+    xmlns:plone="http://namespaces.plone.org/plone"
     xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="plone">
 
-    <browser:resourceDirectory
+    <plone:static
         name="plone.app.event"
+        type="plone"
         directory="resources"
-        permission="zope.Public"
-        layer="..interfaces.IBrowserLayer"
         />
 
     <!-- Event listing -->
diff --git a/plone/app/event/profiles/default/cssregistry.xml b/plone/app/event/profiles/default/cssregistry.xml
deleted file mode 100644
index 8a6629654..000000000
--- a/plone/app/event/profiles/default/cssregistry.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<object name="portal_css">
- <stylesheet title=""
-    id="++resource++plone.app.event/event.css"
-    media="screen" rel="stylesheet" rendering="link"
-    cacheable="True" compression="safe" cookable="True"
-    enabled="True" expression="" />
-</object>
diff --git a/plone/app/event/profiles/default/jsregistry.xml b/plone/app/event/profiles/default/jsregistry.xml
deleted file mode 100644
index 2704c9189..000000000
--- a/plone/app/event/profiles/default/jsregistry.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<object name="portal_javascripts" meta_type="JavaScripts Registry">
-
-  <javascript
-      cacheable="True"
-      compression="safe"
-      cookable="True"
-      enabled="True"
-      id="++resource++plone.app.event/event.js"
-      inline="False"
-      />
-
-</object>
diff --git a/plone/app/event/profiles/default/registry.xml b/plone/app/event/profiles/default/registry.xml
new file mode 100644
index 000000000..3444fb09f
--- /dev/null
+++ b/plone/app/event/profiles/default/registry.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<registry>
+
+  <records prefix="plone.resources/plone-app-event-js"
+            interface='Products.CMFPlone.interfaces.IResourceRegistry'>
+      <value key="js">++plone++plone.app.event/event.js</value>
+  </records>
+  <records prefix="plone.bundles/plone-legacy"
+            interface='Products.CMFPlone.interfaces.IBundleRegistry'>
+    <value key="resources" purge="false">
+      <element>plone-app-event-js</element>
+    </value>
+    <value key="last_compilation"></value>
+  </records>
+
+</registry>
diff --git a/setup.py b/setup.py
index 8aa5ae229..81cf1fcee 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 import os
 
 
-version = '3.1.2.dev0'
+version = '3.2.0.dev0'
 
 
 setup(