diff --git a/meta/packages/opensync/libopensync-plugin-evo2-sync_0.22.bb b/meta/packages/opensync/libopensync-plugin-evo2-sync_0.22.bb
deleted file mode 100644
index 6b2609902a..0000000000
--- a/meta/packages/opensync/libopensync-plugin-evo2-sync_0.22.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-PLUGIN_ARCHIVE = "evolution2"
-
-require libopensync-plugin.inc
-require libopensync-plugin_0.22.inc
-
-DEPENDS += " eds-dbus"
diff --git a/meta/packages/opensync/libopensync-plugin-file-sync_0.22.bb b/meta/packages/opensync/libopensync-plugin-file-sync_0.22.bb
deleted file mode 100644
index d34473127d..0000000000
--- a/meta/packages/opensync/libopensync-plugin-file-sync_0.22.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require libopensync-plugin.inc
-require libopensync-plugin_0.22.inc
diff --git a/meta/packages/opensync/libopensync-plugin-irmc-sync_0.22.bb b/meta/packages/opensync/libopensync-plugin-irmc-sync_0.22.bb
deleted file mode 100644
index 55df4e4d78..0000000000
--- a/meta/packages/opensync/libopensync-plugin-irmc-sync_0.22.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require libopensync-plugin.inc
-require libopensync-plugin_0.22.inc
-
-DEPENDS += "openobex bluez-libs"
diff --git a/meta/packages/opensync/libopensync-plugin-irmc_0.36.bb b/meta/packages/opensync/libopensync-plugin-irmc_0.36.bb
index 295dfdecfa..c06de2fde8 100644
--- a/meta/packages/opensync/libopensync-plugin-irmc_0.36.bb
+++ b/meta/packages/opensync/libopensync-plugin-irmc_0.36.bb
@@ -1,3 +1,3 @@
 require libopensync-plugin_0.36.inc
 
-DEPENDS += "openobex bluez-libs"
+DEPENDS += "openobex bluez4"
diff --git a/meta/packages/opensync/libopensync-plugin-svn.inc b/meta/packages/opensync/libopensync-plugin-svn.inc
deleted file mode 100644
index b268a007d7..0000000000
--- a/meta/packages/opensync/libopensync-plugin-svn.inc
+++ /dev/null
@@ -1 +0,0 @@
-PV = "0.22+svnr${SRCREV}"
diff --git a/meta/packages/opensync/libopensync-plugin.inc b/meta/packages/opensync/libopensync-plugin.inc
deleted file mode 100644
index ce686321a4..0000000000
--- a/meta/packages/opensync/libopensync-plugin.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-LICENSE ?= "LGPL"
-DEPENDS += " libopensync"
-RRECOMMENDS += " msynctool"
-HOMEPAGE ?= "http://www.opensync.org/"
-
-PLUGIN_NAME ?= "${@bb.data.getVar('PN', d, 1).replace('libopensync-plugin-','')}"
-PLUGIN_SONAME ?= "${@bb.data.getVar('PLUGIN_NAME', d, 1).replace('-','_')}.so"
-SRC_URI ?= "svn://svn.opensync.org/plugins;module=${PLUGIN_NAME};proto=http"
-S ?= "${WORKDIR}/${PLUGIN_NAME}"
-
-inherit autotools pkgconfig
-
-FILES_${PN} += "${datadir} ${libdir}/opensync/plugins/*.so"
-FILES_${PN}-dbg += "${libdir}/opensync/plugins/.debug"
-
-do_install() {
-	install -d ${D}${datadir}/opensync/defaults
-	install -d ${D}${libdir}/opensync/plugins
-	install -m 644 src/${PLUGIN_NAME} ${D}${datadir}/opensync/defaults
-	install -m 755 src/.libs/${PLUGIN_SONAME} ${D}${libdir}/opensync/plugins/
-}
diff --git a/meta/packages/opensync/libopensync-plugin_0.22.inc b/meta/packages/opensync/libopensync-plugin_0.22.inc
deleted file mode 100644
index 31709e8b28..0000000000
--- a/meta/packages/opensync/libopensync-plugin_0.22.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-PV = "0.22"
-PLUGIN_ARCHIVE ?= "${@bb.data.getVar('PLUGIN_NAME', d, 1).replace('-sync','')}"
-SRC_URI = "http://www.opensync.org/download/releases/0.22/libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}.tar.bz2"
-
-S = "${WORKDIR}/libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}/"
-
diff --git a/meta/packages/opensync/libopensync/fix-attr.patch b/meta/packages/opensync/libopensync/fix-attr.patch
deleted file mode 100644
index 7a2e5441c8..0000000000
--- a/meta/packages/opensync/libopensync/fix-attr.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: trunk/opensync/merger/opensync_xmlfield.c
-===================================================================
---- trunk.orig/opensync/merger/opensync_xmlfield.c	2007-04-12 16:40:07.000000000 +0200
-+++ trunk/opensync/merger/opensync_xmlfield.c	2007-04-12 16:40:11.000000000 +0200
-@@ -298,7 +298,7 @@
- 	int count;
- 	xmlAttrPtr attr = xmlfield->node->properties;
- 	
--	for(count=0; attribute != NULL; count++) {
-+	for(count=0; attr != NULL; count++) {
- 		if(count == nth)
- 			return (const char *)attr->name;
- 		attr = attr->next;
diff --git a/meta/packages/opensync/libopensync/gcc.patch b/meta/packages/opensync/libopensync/gcc.patch
deleted file mode 100644
index 3eee014339..0000000000
--- a/meta/packages/opensync/libopensync/gcc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: trunk/SConstruct
-===================================================================
---- trunk.orig/SConstruct	2007-04-25 13:20:13.000000000 +0200
-+++ trunk/SConstruct	2007-04-25 14:00:02.000000000 +0200
-@@ -36,7 +36,11 @@
- opts.Add(BoolOption('enable_python', 'Build python wrapper? (swig required)', 0))
- opts.Add(BoolOption('debug_modules', 'Should unloading of shared modules be avoided (DEBUGGING ONLY!)', 0))
- opts.Add(BoolOption('enable_doxygen', 'Generating OpenSync API with doxygen?', 0))
--
-+opts.AddOptions(
-+('CC', 'Path to Custom c compiler', 'gcc'),
-+('CXX', 'Path to Custom c++ compiler flags', 'g++'),
-+('LDFLAGS', 'Linker flags', ''),
-+)
- 
- target_dir = SelectBuildDir('build')
- sys.path.append(target_dir)
-@@ -63,6 +67,11 @@
- env.Append(CCFLAGS = r'-DENABLE_TOOLS=$enable_tools')
- env.Append(CCFLAGS = r'-DENABLE_PROFILING=$enable_profiling')
- 
-+env.Replace(
-+       CC = env['CC'],
-+       CXX = env['CXX'],
-+       LDFLAGS = env['LDFLAGS']
-+)
- 
- # pkg config files
- subst_dict={'@prefix@': '$prefix',
diff --git a/meta/packages/opensync/libopensync/no-werror.patch b/meta/packages/opensync/libopensync/no-werror.patch
deleted file mode 100644
index 523ceaaeb5..0000000000
--- a/meta/packages/opensync/libopensync/no-werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: trunk/build/linux/osync_build.py
-===================================================================
---- trunk.orig/build/linux/osync_build.py	2007-04-25 13:28:44.000000000 +0200
-+++ trunk/build/linux/osync_build.py	2007-04-25 13:28:54.000000000 +0200
-@@ -48,7 +48,7 @@
- 	env.ParseConfig('pkg-config --cflags --libs libxml-2.0')
- 	env.ParseConfig('pkg-config --cflags --libs sqlite3')
- 	env.Append(CCFLAGS = r'-I.')
--	env.Append(CCFLAGS = [r'-Wall', r'-Werror'])
-+	env.Append(CCFLAGS = [r'-Wall'])
- 	
- 	testenv = env.Copy()
- 	testenv.Append(CCFLAGS = r'-I' + testenv.GetLaunchDir() + '/tests')
diff --git a/meta/packages/opensync/libopensync/zlib.patch b/meta/packages/opensync/libopensync/zlib.patch
deleted file mode 100644
index 89c10a85bc..0000000000
--- a/meta/packages/opensync/libopensync/zlib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: trunk/opensync/SConscript
-===================================================================
---- trunk.orig/opensync/SConscript	2007-04-25 14:08:21.000000000 +0200
-+++ trunk/opensync/SConscript	2007-04-25 14:08:40.000000000 +0200
-@@ -149,6 +149,8 @@
- gmodule-2.0
- libxml2
- sqlite3
-+z
-+m
- """
- 
- libopensync = env.SharedLibrary('opensync', Split(sources), LIBS = Split(Libraries))
diff --git a/meta/packages/opensync/libsyncml/remove-insane-assembler.patch b/meta/packages/opensync/libsyncml/remove-insane-assembler.patch
deleted file mode 100644
index ad3ba01a2c..0000000000
--- a/meta/packages/opensync/libsyncml/remove-insane-assembler.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libsyncml-0.4.7/tests/check_http.c
-===================================================================
---- libsyncml-0.4.7.orig/tests/check_http.c	2008-10-20 14:16:26.000000000 +0100
-+++ libsyncml-0.4.7/tests/check_http.c	2008-10-20 14:16:53.000000000 +0100
-@@ -221,7 +221,6 @@
- 			
- 			break;
- 		default:
--			__asm__("int $3");
- 			fail(NULL);
- 	}
-