--- a/src/pyams_media/converter.py	Thu Apr 21 17:11:44 2016 +0200
+++ b/src/pyams_media/converter.py	Tue Nov 15 10:00:21 2016 +0100
@@ -27,8 +27,9 @@
 from pyams_media.ffdocument import FFDocument
 from pyams_utils.list import unique
 from pyams_utils.registry import utility_config, get_utilities_for, query_utility
+from pyams_utils.vocabulary import vocabulary_config
 from zope.interface import implementer
-from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm, getVocabularyRegistry
+from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
 
 from pyams_media import _
 
@@ -121,6 +122,7 @@
     format = 'ogg'
 
 
+@vocabulary_config(name='PyAMS media audio converters')
 class AudioConvertersVocabulary(SimpleVocabulary):
     """Audio converters vocabulary"""
 
@@ -130,8 +132,6 @@
                  if IMediaAudioConverter.providedBy(util)]
         super(AudioConvertersVocabulary, self).__init__(terms)
 
-getVocabularyRegistry().register('PyAMS media audio converters', AudioConvertersVocabulary)
-
 
 #
 # Video converters
@@ -233,6 +233,7 @@
         effects['r:v'] = '25/1'
 
 
+@vocabulary_config(name='PyAMS media video converters')
 class VideoConvertersVocabulary(SimpleVocabulary):
     """Video converters vocabulary"""
 
@@ -241,5 +242,3 @@
                  for name, util in unique(get_utilities_for(IMediaConverter))
                  if IMediaVideoConverter.providedBy(util)]
         super(VideoConvertersVocabulary, self).__init__(terms)
-
-getVocabularyRegistry().register('PyAMS media video converters', VideoConvertersVocabulary)