--- a/src/pyams_security/permission.py	Tue Oct 11 16:09:19 2016 +0200
+++ b/src/pyams_security/permission.py	Tue Nov 15 10:34:41 2016 +0100
@@ -16,13 +16,13 @@
 
 # import interfaces
 from pyams_security.interfaces import IPermission
-from zope.schema.interfaces import IVocabularyFactory
 
 # import packages
 from pyams_utils.request import check_request
-from zope.interface import implementer, provider
+from pyams_utils.vocabulary import vocabulary_config
+from zope.interface import implementer
 from zope.schema.fieldproperty import FieldProperty
-from zope.schema.vocabulary import getVocabularyRegistry, SimpleTerm, SimpleVocabulary
+from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary
 
 
 @implementer(IPermission)
@@ -53,7 +53,7 @@
     config.registry.registerUtility(permission, IPermission, name=permission.id)
 
 
-@provider(IVocabularyFactory)
+@vocabulary_config(name='PyAMS permissions')
 class PermissionsVocabulary(SimpleVocabulary):
     """Permissions vocabulary"""
 
@@ -67,5 +67,3 @@
                  for n, p in registry.getUtilitiesFor(self.interface)]
         terms.sort(key=lambda x: x.title)
         super(PermissionsVocabulary, self).__init__(terms)
-
-getVocabularyRegistry().register('PyAMS permissions', PermissionsVocabulary)