Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py	(revision 6096)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py	(revision 6097)
@@ -34,5 +34,4 @@
 from waeup.sirp.image.image import WAeUPImageFile
 from waeup.sirp.interfaces import IWAeUPObject, SimpleWAeUPVocabulary
-from waeup.sirp.university.vocabularies import FutureYearsSource
 
 
@@ -67,4 +66,17 @@
 application_types_vocab = SimpleWAeUPVocabulary(*APPLICATION_TYPES)
 
+class FutureYearsSource(BasicSourceFactory):
+    """XXX: need docs
+    """
+    def getValues(self):
+        curr_year = datetime.now().year
+        return [x for x in range(curr_year - 0, curr_year + 5)]
+
+    def getToken(self, value):
+        return str(value)
+
+    def getTitle(self, value):
+      return str(value)
+
 class GenderSource(BasicSourceFactory):
     """A gender source delivers basically a mapping
Index: /main/waeup.sirp/trunk/src/waeup/sirp/university/vocabularies.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/university/vocabularies.py	(revision 6096)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/university/vocabularies.py	(revision 6097)
@@ -83,5 +83,5 @@
     def getValues(self):
         curr_year = datetime.now().year
-        return [x for x in range(curr_year - 2, curr_year + 5)]
+        return [x for x in range(curr_year - 0, curr_year + 5)]
 
     def getToken(self, value):
