diff --git a/libnl.patches/libnl-50.description b/libnl.patches/libnl-50.description
deleted file mode 100644
index 9cc7d22..0000000
--- a/libnl.patches/libnl-50.description
+++ /dev/null
@@ -1,2 +0,0 @@
-This patch ensures that the build picks up the auto-generated header file
-pktloc_syntax.h.
diff --git a/libnl.patches/libnl-50.patch b/libnl.patches/libnl-50.patch
deleted file mode 100644
index 525a6d3..0000000
--- a/libnl.patches/libnl-50.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aruN a/lib/Makefile.in b/lib/Makefile.in
---- a/lib/Makefile.in	2010-10-13 07:50:57.000000000 -0700
-+++ b/lib/Makefile.in	2010-11-15 15:57:54.885153794 -0800
-@@ -254,7 +254,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\"
-+AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -I${builddir}/route -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\"
- lib_LTLIBRARIES = \
- 	libnl.la libnl-genl.la libnl-route.la libnl-nf.la
- 
diff --git a/libnl.patches/libnl-51.description b/libnl.patches/libnl-51.description
deleted file mode 100644
index 242686c..0000000
--- a/libnl.patches/libnl-51.description
+++ /dev/null
@@ -1,7 +0,0 @@
-Was getting this build error:
-/home/bamboo/bamboo-agent-home/xml-data/build-dir/STESTS-ECIC-JOB1/production/sw/tps/libnl/libnl-2.0/lib/route/pktloc.c:39: fatal error: pktloc_syntax.h: No such file or directoryI
-
-Related to parallel build.
-
-Looks like part of this should fix it:
-http://patchwork.openembedded.org/patch/12583/
diff --git a/libnl.patches/libnl-51.patch b/libnl.patches/libnl-51.patch
deleted file mode 100644
index 406d97c..0000000
--- a/libnl.patches/libnl-51.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur a/lib/Makefile.in b/lib/Makefile.in
---- a/lib/Makefile.in	2015-03-13 22:44:43.967266167 -0700
-+++ b/lib/Makefile.in	2015-03-13 22:47:05.496603070 -0700
-@@ -301,7 +301,7 @@
- 	\
- 	route/pktloc_syntax.c route/pktloc_grammar.c route/pktloc.c
- 
--all: defs.h
-+all: defs.h route/pktloc_syntax.h route/pktloc_grammar.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
- .SUFFIXES:
-@@ -977,9 +977,11 @@
- 
- # Hack to avoid using ylwrap. It does not function correctly in combination
- # with --header-file=
-+route/pktloc_grammar.h: route/pktloc_grammar.c
- route/pktloc_grammar.c: route/pktloc_grammar.l
- 	$(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
- 
-+route/pktloc_syntax.h: route/pktloc_syntax.c
- route/pktloc_syntax.c: route/pktloc_syntax.y
- 	$(YACC) -d $(YFLAGS) -o $@ $^
- 
diff --git a/libnl.tar.gz b/libnl.tar.gz
deleted file mode 100644
index 58a3c07..0000000
--- a/libnl.tar.gz
+++ /dev/null
Binary files differ
diff --git a/libnl.url b/libnl.url
deleted file mode 100644
index cd1dcda..0000000
--- a/libnl.url
+++ /dev/null
@@ -1 +0,0 @@
-http://www.infradead.org/~tgr/libnl/files/libnl-2.0.tar.gz
diff --git a/libnl.version b/libnl.version
deleted file mode 100644
index cd5ac03..0000000
--- a/libnl.version
+++ /dev/null
@@ -1 +0,0 @@
-2.0
diff --git a/userspace-rcu.patches/userspace-rcu-50.description b/userspace-rcu.patches/userspace-rcu-50.description
new file mode 100644
index 0000000..7728cf7
--- /dev/null
+++ b/userspace-rcu.patches/userspace-rcu-50.description
@@ -0,0 +1 @@
+The new Poky 4.8.2 toolchain has fix (https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=204665) in it. So removing the checks from urcu.
diff --git a/userspace-rcu.patches/userspace-rcu-50.patch b/userspace-rcu.patches/userspace-rcu-50.patch
new file mode 100644
index 0000000..01df074
--- /dev/null
+++ b/userspace-rcu.patches/userspace-rcu-50.patch
@@ -0,0 +1,27 @@
+diff -aruN a/urcu/compiler.h b/urcu/compiler.h
+--- a/urcu/compiler.h	2015-08-27 13:16:02.181943077 -0700
++++ b/urcu/compiler.h	2015-08-27 13:16:45.781409041 -0700
+@@ -108,23 +108,4 @@
+ 
+ #define CAA_ARRAY_SIZE(x)	(sizeof(x) / sizeof((x)[0]))
+ 
+-/*
+- * Don't allow compiling with buggy compiler.
+- */
+-
+-#ifdef __GNUC__
+-# define URCU_GCC_VERSION	(__GNUC__ * 10000 \
+-				+ __GNUC_MINOR__ * 100 \
+-				+ __GNUC_PATCHLEVEL__)
+-
+-/*
+- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58854
+- */
+-# ifdef __ARMEL__
+-#  if URCU_GCC_VERSION >= 40800 && URCU_GCC_VERSION <= 40802
+-#   error Your gcc version produces clobbered frame accesses
+-#  endif
+-# endif
+-#endif
+-
+ #endif /* _URCU_COMPILER_H */
diff --git a/userspace-rcu.tar.bz2 b/userspace-rcu.tar.bz2
new file mode 100644
index 0000000..90fc64e
--- /dev/null
+++ b/userspace-rcu.tar.bz2
Binary files differ
diff --git a/userspace-rcu.url b/userspace-rcu.url
new file mode 100644
index 0000000..ff29217
--- /dev/null
+++ b/userspace-rcu.url
@@ -0,0 +1 @@
+http://lttng.org/files/urcu/userspace-rcu-0.8.7.tar.bz2
diff --git a/userspace-rcu.version b/userspace-rcu.version
new file mode 100644
index 0000000..1e9b46b
--- /dev/null
+++ b/userspace-rcu.version
@@ -0,0 +1 @@
+0.8.7