diff --git a/.gitignore b/.gitignore
index 86621e44..5a3e3237 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.pyc
 *.pyo
 *.mo
+*.orig
diff --git a/CHANGES.rst b/CHANGES.rst
index ebbd69a3..1546c394 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -12,6 +12,11 @@ New features:
 
 - *add item here*
 
+- Add an upgrade step for Products.CMFPlone version 5020
+  - add jqtree-contextmenu to the resource registry
+  - add js-shortcuts to the resource registry
+  [b4oshany]
+  
 Bug fixes:
 
 - *add item here*
diff --git a/plone/app/upgrade/v50/configure.zcml b/plone/app/upgrade/v50/configure.zcml
index 4ffc78a9..37fde6a2 100644
--- a/plone/app/upgrade/v50/configure.zcml
+++ b/plone/app/upgrade/v50/configure.zcml
@@ -376,9 +376,9 @@
         profile="Products.CMFPlone:plone">
 
         <gs:upgradeStep
-            title="Miscellaneous"
+            title="Add jqTree contextual menu"
             description=""
-            handler="..utils.null_upgrade_step"
+            handler=".final.to509"
             />
 
     </gs:upgradeSteps>
diff --git a/plone/app/upgrade/v50/final.py b/plone/app/upgrade/v50/final.py
index 0f4b44a3..0b3c3e63 100644
--- a/plone/app/upgrade/v50/final.py
+++ b/plone/app/upgrade/v50/final.py
@@ -104,6 +104,11 @@ def to507(context):
     loadMigrationProfile(context, 'profile-plone.app.upgrade.v50:to507')
 
 
+def to509(context):
+    """5.0.8 -> 5.0.9"""
+    loadMigrationProfile(context, 'profile-plone.app.upgrade.v50:to509')
+
+
 def fix_double_smaxage(context):
     """Fix caching definition.
 
diff --git a/plone/app/upgrade/v50/profiles.zcml b/plone/app/upgrade/v50/profiles.zcml
index c45f02c4..51e294ba 100644
--- a/plone/app/upgrade/v50/profiles.zcml
+++ b/plone/app/upgrade/v50/profiles.zcml
@@ -129,4 +129,13 @@
       provides="Products.GenericSetup.interfaces.EXTENSION"
       />
 
+  <genericsetup:registerProfile
+      name="to509"
+      title="Upgrade profile for Plone 5.0.8 to Plone 5.0.9"
+      description=""
+      directory="profiles/to_509"
+      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
 </configure>
diff --git a/plone/app/upgrade/v50/profiles/to_509/registry.xml b/plone/app/upgrade/v50/profiles/to_509/registry.xml
new file mode 100644
index 00000000..f8f18bd5
--- /dev/null
+++ b/plone/app/upgrade/v50/profiles/to_509/registry.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<registry>
+  <records prefix="plone.resources/jqtree-contextmenu"
+           interface='Products.CMFPlone.interfaces.IResourceRegistry'>
+      <value key="js">++plone++static/components/cs-jqtree-contextmenu/src/jqTreeContextMenu.js</value>
+      <value key="deps">jqtree</value>
+  </records>
+  <records prefix="plone.resources/js-shortcuts"
+           interface='Products.CMFPlone.interfaces.IResourceRegistry'>
+      <value key="js">++plone++static/components/js-shortcuts/js-shortcuts.js</value>
+      <value key="deps">jquery</value>
+  </records>
+</registry>