Index: /main/waeup.fceokene/trunk/buildout.cfg
===================================================================
--- /main/waeup.fceokene/trunk/buildout.cfg	(revision 8897)
+++ /main/waeup.fceokene/trunk/buildout.cfg	(revision 8898)
@@ -1,4 +1,11 @@
 [buildout]
-develop = . waeup.kofa kofacustom.nigeria
+# See http://pypi.python.org/pypi/mr.developer for details
+extensions = mr.developer
+auto-checkout = waeup.kofa kofacustom.nigeria
+# We cannot use 'src' (the default) as the checked out projects won't
+# work properly with paster (paster looks up any upper directory
+# egg-info dirs and then complains about not-available packages).
+sources-dir = sources
+develop = .
 parts =
     eggbasket
@@ -31,4 +38,8 @@
 # unless you specify an eggs-directory option here.
 
+[sources]
+waeup.kofa = svn https://svn.waeup.org/repos/main/waeup.kofa/trunk
+kofacustom.nigeria = svn https://svn.waeup.org/repos/main/kofacustom.nigeria/trunk
+
 [kofa_params]
 ## Basic parameters for deployment.
@@ -60,4 +71,5 @@
        repoze.profile
        ZODB3
+interpreter = python-console
 
 [kofactl]
Index: /main/waeup.fceokene/trunk/src/waeup/fceokene/configure.zcml
===================================================================
--- /main/waeup.fceokene/trunk/src/waeup/fceokene/configure.zcml	(revision 8897)
+++ /main/waeup.fceokene/trunk/src/waeup/fceokene/configure.zcml	(revision 8898)
@@ -1,7 +1,11 @@
-<configure xmlns="http://namespaces.zope.org/zope">
+<configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:grok="http://namespaces.zope.org/grok">
+  <include package="waeup.fceokene" file="locales.zcml" />
 
-  <include package="waeup.fceokene" file="locales.zcml" />
-  <include package="grok" />
-  <includeOverrides package="waeup.fceokene" file="overrides.zcml" />
+  <!-- kofacustom.nigeria configures everything we basically need.
+  -->
+  <include package="kofacustom.nigeria" />
+
+  <grok:grok package="." />
 
 </configure>
Index: /main/waeup.fceokene/trunk/src/waeup/fceokene/ftesting.zcml
===================================================================
--- /main/waeup.fceokene/trunk/src/waeup/fceokene/ftesting.zcml	(revision 8897)
+++ /main/waeup.fceokene/trunk/src/waeup/fceokene/ftesting.zcml	(revision 8898)
@@ -6,7 +6,6 @@
    >
 
-  <include package="grok" />
-  <includeOverrides package="waeup.fceokene" />
-  <includeOverrides package="waeup.fceokene" file="mail.zcml"/>
+  <include package="waeup.fceokene" />
+  <include package="waeup.fceokene" file="mail.zcml"/>
 
   <!-- Where should the datacenter reside by default? -->
Index: in/waeup.fceokene/trunk/src/waeup/fceokene/overrides.zcml
===================================================================
--- /main/waeup.fceokene/trunk/src/waeup/fceokene/overrides.zcml	(revision 8897)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<configure xmlns="http://namespaces.zope.org/zope"
-           xmlns:grok="http://namespaces.zope.org/grok">
-  <includeDependencies package="." />
-  <grok:grok package="." />
-
-  <!-- Register edit widget for PhoneNumbers -->
-  <adapter
-      for="waeup.kofa.schema.interfaces.IPhoneNumber
-           zope.publisher.interfaces.browser.IBrowserRequest"
-      provides="zope.formlib.interfaces.ISimpleInputWidget"
-      factory="waeup.fceokene.widgets.phonewidget.CustomPhoneWidget"
-      permission="zope.Public"
-      />
-
-</configure>
