Index: /main/waeup.sirp/trunk/src/waeup/sirp/university/catalog.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/university/catalog.py	(revision 6207)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/university/catalog.py	(revision 6208)
@@ -11,7 +11,10 @@
 from waeup.sirp.university.interfaces import (
     ICourse, ICertificateCourse, IDepartment,
+    ICertificate,
     )
 
 class CourseIndexes(grok.Indexes):
+    """This catalog is needed for building sources.
+    """
     grok.site(IUniversity)
     grok.name('courses_catalog')
@@ -21,5 +24,18 @@
     title = grok.index.Text(attribute='title')
 
-class CourseCertificatesIndexes(grok.Indexes):
+class CertificatesIndexes(grok.Indexes):
+    """This catalog is needed for building sources.
+    """
+    grok.site(IUniversity)
+    grok.name('certifcates_catalog')
+    grok.context(ICertificate)
+
+    code = grok.index.Field(attribute='code')
+    title = grok.index.Field(attribute='application_category')
+
+class CertificateCoursesIndexes(grok.Indexes):
+    """This catalog is needed for automatic removal of certificate courses
+    and later for selection course tickets in the students section.
+    """
     grok.site(IUniversity)
     grok.name('certcourses_catalog')
@@ -47,4 +63,19 @@
         # catalog not available. This might happen during tests.
         return
+    intids = getUtility(IIntIds)
+    index = cat['code']
+    index.index_doc(intids.getId(obj), obj)
+
+@grok.subscribe(ICourse, grok.IObjectAddedEvent)
+def handleCertificateAdd(obj, event):
+    """Index an added certificates with the local catalog.
+
+    See handleCourseAdd.
+    """
+    try:
+      cat = getUtility(ICatalog, name='certificates_catalog')
+    except ComponentLookupError:
+      # catalog not available. This might happen during tests.
+      return
     intids = getUtility(IIntIds)
     index = cat['code']
