diff --git a/component/occi/accords-cocarrier-patch.diff b/component/occi/accords-cocarrier-patch.diff
new file mode 100644
index 0000000000000000000000000000000000000000..0cc8aac56703100bd73ec1f91d403d0660a63282
--- /dev/null
+++ b/component/occi/accords-cocarrier-patch.diff
@@ -0,0 +1,20 @@
+diff --git a/Makefile.am b/Makefile.am
+index 46432c5..a2c48a1 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -21,12 +21,12 @@ endif
+ if ENABLE_COREST
+ SUBDIRS += corest
+ endif
+-if ENABLE_COCCI
+-SUBDIRS += cocci
+-endif
+ if ENABLE_COCARRIER
+ SUBDIRS += cocarrier
+ endif
++if ENABLE_COCCI
++SUBDIRS += cocci
++endif
+ if ENABLE_COPABR
+ SUBDIRS += copabr
+ endif
\ No newline at end of file
diff --git a/component/occi/buildout.cfg b/component/occi/buildout.cfg
index 6fcf3348e65a5fa3e6cc73360f7bc8135bab096f..8791f0747a461b340db36a6e34a5eb606d70c76e 100644
--- a/component/occi/buildout.cfg
+++ b/component/occi/buildout.cfg
@@ -2,18 +2,52 @@
 extends =
   ../autoconf/buildout.cfg
   ../automake/buildout.cfg
+  ../libtool/buildout.cfg
+  ../git/buildout.cfg
   ../openssl/buildout.cfg
   ../libuuid/buildout.cfg
 
 parts = accords
 
+[accords-source]
+recipe=plone.recipe.command
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+stop-on-error = true
+url = http://git.gitorious.ow2.org/ow2-compatibleone/accords-platform.git
+command =
+  (${git:location}/bin/git clone --quiet ${:url} ${:location} ) || (rm -fr ${:location} ; exit 1)
+update-command =
+ cd ${:location} && ${git:location}/bin/git pull --quiet origin master
+
 [accords]
 # Part of Compatible One project
 # http://gitorious.ow2.org/ow2-compatibleone/accords-platform
 recipe = hexagonit.recipe.cmmi
-url = http://gitorious.ow2.org/ow2-compatibleone/accords-platform/archive-tarball/master
+#url = http://gitorious.ow2.org/ow2-compatibleone/accords-platform/archive-tarball/master
+path = ${accords-source:location}/
 #md5sum = 
-# ./autogen.sh
+# Replaces autogen.sh
+configure-command =
+  ./clean
+  libtoolize -c -f
+  aclocal -I ${libtool:location}/share/aclocal
+  automake -c -a -f --add-missing
+  autoreconf --install
+  ./configure
+configure-options =
+  --with-ssl=${openssl:location}
+patches =
+  ${accords-cocarrier-patch:location}/${accords-cocarrier-patch:filename}
+patch-options = -p0
 environment =
-  CPPFLAGS =-I${libuuid:location}/include
+  CPPFLAGS =-I${libuuid:location}/include -I${openssl:location}/include
   LDFLAGS =-Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib
+  LIBTOOL=libtool
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:%(PATH)s
+
+[accords-cocarrier-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+#md5sum = 22b0ef8baec5efc182e10d233c6f14ca
+filename = accords-cocarrier-patch.diff
+download-only = true
\ No newline at end of file