diff --git a/buildout/profiles/official-2.12.cfg b/buildout/profiles/official-2.12.cfg
index 6cd23919723082adc3ac68ff995ef7d7bacb4ba1..91ba3eeeae02adcce7b09edcee82e375d0f297e5 100644
--- a/buildout/profiles/official-2.12.cfg
+++ b/buildout/profiles/official-2.12.cfg
@@ -20,6 +20,7 @@ extends =
   ../software-profiles/oood.cfg
   ../software-profiles/openoffice-bin.cfg
   ../software-profiles/python-2.6.cfg
+  ../software-profiles/rdiff-backup.cfg
   ../software-profiles/varnish.cfg
   ../profiles/common.cfg
 
@@ -35,6 +36,7 @@ parts =
   itools-build
   apache
   memcached
+  rdiff-backup
   ocropus
   haproxy
   flare
diff --git a/buildout/profiles/official.cfg b/buildout/profiles/official.cfg
index d3ba4946e2b7b9cec4a2ae2032eaf1571af9c625..667ff6470158316a3d2738c03d9c36b148958687 100644
--- a/buildout/profiles/official.cfg
+++ b/buildout/profiles/official.cfg
@@ -12,12 +12,12 @@ extends =
   ../software-profiles/imagemagick.cfg
   ../software-profiles/libevent.cfg
   ../software-profiles/memcached.cfg
-  ../software-profiles/rdiff-backup.cfg
   ../software-profiles/mysql-tritonn-5.0.cfg
   ../software-profiles/ocropus.cfg
   ../software-profiles/oood.cfg
   ../software-profiles/openoffice-bin.cfg
   ../software-profiles/python-2.4.cfg
+  ../software-profiles/rdiff-backup.cfg
   ../software-profiles/varnish.cfg
   ../software-profiles/zope-2.8.cfg
   ../profiles/common.cfg
diff --git a/buildout/profiles/versions-2.12.cfg b/buildout/profiles/versions-2.12.cfg
index 50b16283f45a6e031b6c8a27fd9e833bd635035b..7a22824f3319b13e630da889d37ae9663cfdd48b 100644
--- a/buildout/profiles/versions-2.12.cfg
+++ b/buildout/profiles/versions-2.12.cfg
@@ -14,6 +14,7 @@ ipython = 0.10
 numpy = 1.3.0
 plone.recipe.zope2instance = 3.6
 erp5.recipe.standaloneinstance >= 0.4
+rdiff-backup = 1.0.5
 pysvn = 1.7.2
 xml-marshaller = 0.9a
 # Use SOAPpy from http://ibid.omnia.za.net/eggs/ instead of
diff --git a/buildout/profiles/versions.cfg b/buildout/profiles/versions.cfg
index 111d3f02d1c1535b85a48956802e553a07285a2f..fda41d437ebc2798f99dd029ffb59582ad13d5f7 100644
--- a/buildout/profiles/versions.cfg
+++ b/buildout/profiles/versions.cfg
@@ -10,6 +10,6 @@ erp5.recipe.standaloneinstance >= 0.4
 erp5.recipe.mysqlserver >= 1.1.1
 pysvn = 1.7.2
 xml-marshaller = 0.9a
-
+rdiff-backup = 1.0.5
 erp5_products_revision =
 erp5_bt5_revision = ${:erp5_products_revision}
diff --git a/buildout/software-profiles/rdiff-backup.cfg b/buildout/software-profiles/rdiff-backup.cfg
index 945372d7855655c4c288f50c6e6e9adc45bdb777..039c54d86b1bad1cd5a7c1ae2c6e479eb3cb7354 100644
--- a/buildout/software-profiles/rdiff-backup.cfg
+++ b/buildout/software-profiles/rdiff-backup.cfg
@@ -1,18 +1,12 @@
 [buildout]
-parts = rdiff-backup
+parts =
+  rdiff-backup
 
 [rdiff-backup]
-<= rdiff-backup-1.0.5
-
-[rdiff-backup-1.0.5-download]
-recipe = hexagonit.recipe.download
-url = http://download.savannah.nongnu.org/releases/rdiff-backup/rdiff-backup-1.0.5.tar.gz
-
-[rdiff-backup-1.0.5]
-recipe = plone.recipe.command
-command =
-  cd ${rdiff-backup-1.0.5-download:location}/rdiff-backup-1.0.5
-  ${python2.4:executable} setup.py build
-  ${python2.4:executable} setup.py install --prefix=${buildout:directory}/parts/rdiff-backup
-
-update-command = ${:command}
+# Note: To avoid system dependency on librsync-devel this egg can be split
+# into custom part to build against local librsync and part to generate
+# scripts
+recipe = zc.recipe.egg
+entry-points =
+  rdiff-backup=rdiff_backup.Main:Main
+arguments = sys.argv[1:]
diff --git a/buildout/tests/assertSoftware.py b/buildout/tests/assertSoftware.py
index 39f71388d615cd73b7be55515445536f129f889d..9d17934d23320d28a4560c67aad07c86ac9fb72b 100644
--- a/buildout/tests/assertSoftware.py
+++ b/buildout/tests/assertSoftware.py
@@ -150,8 +150,8 @@ class AssertSoftwareRunable(unittest.TestCase):
     self.assertTrue(stdout.startswith('flare'))
 
   def test_rdiff_backup(self):
-    stdout, stderr = subprocess.Popen(["parts/rdiff-backup/bin/rdiff-backup",
-      "-v"], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+    stdout, stderr = subprocess.Popen(["bin/rdiff-backup", "-V"],
+        stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
     self.assertEqual(stderr, '')
     self.assertEqual(stdout.strip(), 'rdiff-backup 1.0.5')