diff --git a/lttng-tools.patches/lttng-tools-01.description b/lttng-tools.patches/lttng-tools-01.description
new file mode 100644
index 0000000..4765b72
--- /dev/null
+++ b/lttng-tools.patches/lttng-tools-01.description
@@ -0,0 +1,4 @@
+Explicitly add all the lttng-ust-ctl dependent libraries to make the link work.
+
+This is the kind of thing that pkg-config is supposed to solve... but I don't
+think we use that at Nest.
diff --git a/lttng-tools.patches/lttng-tools-01.patch b/lttng-tools.patches/lttng-tools-01.patch
new file mode 100644
index 0000000..1301afd
--- /dev/null
+++ b/lttng-tools.patches/lttng-tools-01.patch
@@ -0,0 +1,258 @@
+diff -Nurp lttng-tools-2.6.0.orig/src/bin/lttng-consumerd/Makefile.am lttng-tools-2.6.0/src/bin/lttng-consumerd/Makefile.am
+--- lttng-tools-2.6.0.orig/src/bin/lttng-consumerd/Makefile.am	2015-01-19 11:04:57.000000000 -0800
++++ lttng-tools-2.6.0/src/bin/lttng-consumerd/Makefile.am	2017-07-10 14:16:58.469772517 -0700
+@@ -17,5 +17,5 @@ lttng_consumerd_LDADD = \
+ 	   -lrt
+ 
+ if HAVE_LIBLTTNG_UST_CTL
+-lttng_consumerd_LDADD += -llttng-ust-ctl
++lttng_consumerd_LDADD += -llttng-ust-ctl -lurcu-bp -lurcu-cds
+ endif
+diff -Nurp lttng-tools-2.6.0.orig/src/bin/lttng-sessiond/Makefile.am lttng-tools-2.6.0/src/bin/lttng-sessiond/Makefile.am
+--- lttng-tools-2.6.0.orig/src/bin/lttng-sessiond/Makefile.am	2015-01-26 09:16:57.000000000 -0800
++++ lttng-tools-2.6.0/src/bin/lttng-sessiond/Makefile.am	2017-07-10 14:16:58.469772517 -0700
+@@ -56,5 +56,5 @@ lttng_sessiond_LDADD = -lrt -lurcu-commo
+ 
+ 
+ if HAVE_LIBLTTNG_UST_CTL
+-lttng_sessiond_LDADD += -llttng-ust-ctl
++lttng_sessiond_LDADD += -llttng-ust-ctl -lurcu-bp -lurcu-cds
+ endif
+diff -Nurp lttng-tools-2.6.0.orig/src/common/ust-consumer/Makefile.am lttng-tools-2.6.0/src/common/ust-consumer/Makefile.am
+--- lttng-tools-2.6.0.orig/src/common/ust-consumer/Makefile.am	2015-01-03 13:34:58.000000000 -0800
++++ lttng-tools-2.6.0/src/common/ust-consumer/Makefile.am	2017-07-10 14:16:58.469772517 -0700
+@@ -7,7 +7,7 @@ noinst_LTLIBRARIES = libust-consumer.la
+ libust_consumer_la_SOURCES = ust-consumer.c ust-consumer.h
+ 
+ libust_consumer_la_LIBADD = \
+-			-llttng-ust-ctl \
++			-llttng-ust-ctl -lurcu-bp -lurcu-cds \
+ 			$(top_builddir)/src/common/relayd/librelayd.la
+ 
+ endif
+diff -Nurp lttng-tools-2.6.0.orig/tests/regression/tools/filtering/Makefile.am lttng-tools-2.6.0/tests/regression/tools/filtering/Makefile.am
+--- lttng-tools-2.6.0.orig/tests/regression/tools/filtering/Makefile.am	2015-01-26 09:17:15.000000000 -0800
++++ lttng-tools-2.6.0/tests/regression/tools/filtering/Makefile.am	2017-07-10 14:20:30.964871144 -0700
+@@ -11,7 +11,7 @@ endif
+ if HAVE_LIBLTTNG_UST_CTL
+ noinst_PROGRAMS = gen-ust-events
+ gen_ust_events_SOURCES = gen-ust-events.c tp.c tp.h
+-gen_ust_events_LDADD = -llttng-ust
++gen_ust_events_LDADD = -llttng-ust -llttng-ust-tracepoint -lurcu-bp -lurcu-cds
+ endif
+ 
+ noinst_SCRIPTS = test_unsupported_op test_invalid_filter test_valid_filter
+diff -Nurp lttng-tools-2.6.0.orig/tests/regression/ust/daemon/Makefile.am lttng-tools-2.6.0/tests/regression/ust/daemon/Makefile.am
+--- lttng-tools-2.6.0.orig/tests/regression/ust/daemon/Makefile.am	2015-01-03 13:35:00.000000000 -0800
++++ lttng-tools-2.6.0/tests/regression/ust/daemon/Makefile.am	2017-07-10 14:20:30.964871144 -0700
+@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(srcdir)
+ 
+ noinst_PROGRAMS = daemon
+ daemon_SOURCES = daemon.c ust_tests_daemon.h
+-daemon_LDADD = -llttng-ust -llttng-ust-fork
++daemon_LDADD = -llttng-ust -llttng-ust-tracepoint -lurcu-bp -lurcu-cds -llttng-ust-fork
+ 
+ if LTTNG_TOOLS_BUILD_WITH_LIBDL
+ daemon_LDADD += -ldl
+diff -Nurp lttng-tools-2.6.0.orig/tests/regression/ust/exit-fast/Makefile.am lttng-tools-2.6.0/tests/regression/ust/exit-fast/Makefile.am
+--- lttng-tools-2.6.0.orig/tests/regression/ust/exit-fast/Makefile.am	2015-01-03 13:35:00.000000000 -0800
++++ lttng-tools-2.6.0/tests/regression/ust/exit-fast/Makefile.am	2017-07-10 14:20:30.960871161 -0700
+@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(srcdir)
+ 
+ noinst_PROGRAMS = exit-fast
+ exit_fast_SOURCES = exit-fast.c ust_tests_exitfast.h
+-exit_fast_LDADD = -llttng-ust
++exit_fast_LDADD = -llttng-ust -llttng-ust-tracepoint -lurcu-bp -lurcu-cds
+ 
+ if LTTNG_TOOLS_BUILD_WITH_LIBDL
+ exit_fast_LDADD += -ldl
+diff -Nurp lttng-tools-2.6.0.orig/tests/regression/ust/fork/Makefile.am lttng-tools-2.6.0/tests/regression/ust/fork/Makefile.am
+--- lttng-tools-2.6.0.orig/tests/regression/ust/fork/Makefile.am	2015-01-03 13:35:00.000000000 -0800
++++ lttng-tools-2.6.0/tests/regression/ust/fork/Makefile.am	2017-07-10 14:16:58.469772517 -0700
+@@ -2,10 +2,10 @@ AM_CPPFLAGS = -I$(srcdir)
+ 
+ noinst_PROGRAMS = fork fork2
+ fork_SOURCES = fork.c ust_tests_fork.h
+-fork_LDADD = -llttng-ust -llttng-ust-fork
++fork_LDADD = -llttng-ust -llttng-ust-fork -llttng-ust-tracepoint -lurcu-bp -lurcu-cds
+ 
+ fork2_SOURCES = fork2.c
+-fork2_LDADD = -llttng-ust -llttng-ust-fork
++fork2_LDADD = -llttng-ust -llttng-ust-fork -llttng-ust-tracepoint -lurcu-bp -lurcu-cds
+ 
+ if LTTNG_TOOLS_BUILD_WITH_LIBDL
+ fork_LDADD += -ldl
+diff -Nurp lttng-tools-2.6.0.orig/tests/regression/ust/high-throughput/Makefile.am lttng-tools-2.6.0/tests/regression/ust/high-throughput/Makefile.am
+--- lttng-tools-2.6.0.orig/tests/regression/ust/high-throughput/Makefile.am	2015-01-03 13:35:00.000000000 -0800
++++ lttng-tools-2.6.0/tests/regression/ust/high-throughput/Makefile.am	2017-07-10 14:20:30.960871161 -0700
+@@ -1,5 +1,5 @@
+ AM_CFLAGS = -I$(srcdir) -O2
+-AM_LDFLAGS = -llttng-ust
++AM_LDFLAGS = -llttng-ust -llttng-ust-tracepoint -lurcu-bp -lurcu-cds
+ 
+ if LTTNG_TOOLS_BUILD_WITH_LIBDL
+ AM_LDFLAGS += -ldl
+@@ -10,7 +10,7 @@ endif
+ 
+ noinst_PROGRAMS = gen-events
+ gen_events_SOURCES = main.c tp.c tp.h
+-gen_events_LDADD = -llttng-ust
++gen_events_LDADD = -llttng-ust -llttng-ust-tracepoint -lurcu-bp -lurcu-cds
+ 
+ noinst_SCRIPTS = test_high_throughput
+ EXTRA_DIST = test_high_throughput
+diff -Nurp lttng-tools-2.6.0.orig/tests/regression/ust/libc-wrapper/Makefile.am lttng-tools-2.6.0/tests/regression/ust/libc-wrapper/Makefile.am
+--- lttng-tools-2.6.0.orig/tests/regression/ust/libc-wrapper/Makefile.am	2015-01-03 13:35:00.000000000 -0800
++++ lttng-tools-2.6.0/tests/regression/ust/libc-wrapper/Makefile.am	2017-07-10 14:16:58.473772501 -0700
+@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(srcdir)
+ 
+ noinst_PROGRAMS = prog
+ prog_SOURCES = prog.c
+-prog_LDADD = -llttng-ust -llttng-ust-libc-wrapper
++prog_LDADD = -llttng-ust -llttng-ust-libc-wrapper -llttng-ust-tracepoint -lurcu-bp -lurcu-cds
+ 
+ noinst_SCRIPTS = test_libc-wrapper test_libc-wrapper.py
+ EXTRA_DIST = test_libc-wrapper test_libc-wrapper.py
+diff -Nurp lttng-tools-2.6.0.orig/tests/regression/ust/linking/Makefile.am lttng-tools-2.6.0/tests/regression/ust/linking/Makefile.am
+--- lttng-tools-2.6.0.orig/tests/regression/ust/linking/Makefile.am	2015-01-03 13:35:01.000000000 -0800
++++ lttng-tools-2.6.0/tests/regression/ust/linking/Makefile.am	2017-07-10 14:20:30.964871144 -0700
+@@ -9,7 +9,7 @@ LIBS =
+ # Build a version of the test app with built-in tracepoints
+ demo_builtin_SOURCES = demo.c tp.c tp2.c tp3.c ust_tests_demo.h \
+ 	ust_tests_demo2.h ust_tests_demo3.h
+-demo_builtin_LDADD = -llttng-ust
++demo_builtin_LDADD = -llttng-ust -llttng-ust-tracepoint -lurcu-bp -lurcu-cds
+ demo_builtin_CFLAGS = -Werror=old-style-definition
+ 
+ # Build a version statically linked to the providers
+@@ -21,13 +21,13 @@ liblttng_ust_provider_ust_tests_demo_sta
+ 	tp.c ust_tests_demo.h \
+ 	tp2.c ust_tests_demo2.h
+ liblttng_ust_provider_ust_tests_demo_static_la_LIBADD = \
+-	-llttng-ust
++	-llttng-ust -llttng-ust-tracepoint -lurcu-bp -lurcu-cds
+ 
+ # contains ust_tests_demo3.h provider probes
+ liblttng_ust_provider_ust_tests_demo3_static_la_SOURCES = \
+ 	tp3.c ust_tests_demo3.h
+ liblttng_ust_provider_ust_tests_demo3_static_la_LIBADD = \
+-	-llttng-ust
++	-llttng-ust -llttng-ust-tracepoint -lurcu-bp -lurcu-cds
+ 
+ demo_static_SOURCES = demo.c
+ demo_static_LDADD = liblttng-ust-provider-ust-tests-demo-static.la \
+@@ -57,14 +57,14 @@ noinst_LTLIBRARIES += liblttng-ust-provi
+ liblttng_ust_provider_ust_tests_demo_la_SOURCES = \
+ 	tp.c ust_tests_demo.h \
+ 	tp2.c ust_tests_demo2.h
+-liblttng_ust_provider_ust_tests_demo_la_LIBADD = -llttng-ust
++liblttng_ust_provider_ust_tests_demo_la_LIBADD = -llttng-ust -llttng-ust-tracepoint -lurcu-bp -lurcu-cds
+ liblttng_ust_provider_ust_tests_demo_la_LDFLAGS = \
+ 	$(FORCE_SHARED_LIB_OPTIONS)
+ 
+ #contains ust_tests_demo3.h provider probes
+ liblttng_ust_provider_ust_tests_demo3_la_SOURCES = \
+ 	tp3.c ust_tests_demo3.h
+-liblttng_ust_provider_ust_tests_demo3_la_LIBADD = -llttng-ust
++liblttng_ust_provider_ust_tests_demo3_la_LIBADD = -llttng-ust -llttng-ust-tracepoint -lurcu-bp -lurcu-cds
+ liblttng_ust_provider_ust_tests_demo3_la_LDFLAGS = \
+ 	$(FORCE_SHARED_LIB_OPTIONS)
+ 
+diff -Nurp lttng-tools-2.6.0.orig/tests/regression/ust/low-throughput/Makefile.am lttng-tools-2.6.0/tests/regression/ust/low-throughput/Makefile.am
+--- lttng-tools-2.6.0.orig/tests/regression/ust/low-throughput/Makefile.am	2015-01-03 13:35:01.000000000 -0800
++++ lttng-tools-2.6.0/tests/regression/ust/low-throughput/Makefile.am	2017-07-10 14:16:58.473772501 -0700
+@@ -1,5 +1,5 @@
+ AM_CFLAGS = -I$(srcdir) -O2
+-AM_LDFLAGS = -llttng-ust
++AM_LDFLAGS = -llttng-ust -llttng-ust-tracepoint -lurcu-bp -lurcu-cds
+ 
+ if LTTNG_TOOLS_BUILD_WITH_LIBDL
+ AM_LDFLAGS += -ldl
+@@ -10,7 +10,7 @@ endif
+ 
+ noinst_PROGRAMS = gen-events
+ gen_events_SOURCES = main.c tp.c tp.h
+-gen_events_LDADD = -llttng-ust -lurcu
++gen_events_LDADD = -llttng-ust -lurcu -lurcu-bp -lurcu-cds
+ 
+ noinst_SCRIPTS = test_low_throughput
+ EXTRA_DIST = test_low_throughput
+diff -Nurp lttng-tools-2.6.0.orig/tests/regression/ust/multi-session/Makefile.am lttng-tools-2.6.0/tests/regression/ust/multi-session/Makefile.am
+--- lttng-tools-2.6.0.orig/tests/regression/ust/multi-session/Makefile.am	2015-01-26 09:17:15.000000000 -0800
++++ lttng-tools-2.6.0/tests/regression/ust/multi-session/Makefile.am	2017-07-10 14:20:30.956871178 -0700
+@@ -1,5 +1,5 @@
+ AM_CFLAGS = -I$(srcdir) -O2
+-AM_LDFLAGS = -llttng-ust
++AM_LDFLAGS = -llttng-ust -llttng-ust-tracepoint -lurcu-bp -lurcu-cds
+ 
+ if LTTNG_TOOLS_BUILD_WITH_LIBDL
+ AM_LDFLAGS += -ldl
+@@ -10,7 +10,7 @@ endif
+ 
+ noinst_PROGRAMS = gen-nevents
+ gen_nevents_SOURCES = gen-nevents.c tp.c ust_gen_nevents.h
+-gen_nevents_LDADD = -llttng-ust
++gen_nevents_LDADD = -llttng-ust -llttng-ust-tracepoint -lurcu-bp -lurcu-cds -lurcu-bp -lurcu-cds
+ 
+ noinst_SCRIPTS = test_multi_session
+ EXTRA_DIST = test_multi_session
+diff -Nurp lttng-tools-2.6.0.orig/tests/regression/ust/overlap/demo/Makefile.am lttng-tools-2.6.0/tests/regression/ust/overlap/demo/Makefile.am
+--- lttng-tools-2.6.0.orig/tests/regression/ust/overlap/demo/Makefile.am	2015-01-03 13:35:01.000000000 -0800
++++ lttng-tools-2.6.0/tests/regression/ust/overlap/demo/Makefile.am	2017-07-10 14:20:30.964871144 -0700
+@@ -12,12 +12,12 @@ FORCE_SHARED_LIB_OPTIONS = -module -shar
+ liblttng_ust_provider_ust_tests_demo_la_SOURCES = \
+ 	tp.c ust_tests_demo.h \
+ 	tp2.c ust_tests_demo2.h
+-liblttng_ust_provider_ust_tests_demo_la_LIBADD = -llttng-ust
++liblttng_ust_provider_ust_tests_demo_la_LIBADD = -llttng-ust -llttng-ust-tracepoint -lurcu-bp -lurcu-cds
+ liblttng_ust_provider_ust_tests_demo_la_LDFLAGS = $(FORCE_SHARED_LIB_OPTIONS)
+ 
+ #contains ust_tests_demo3.h provider probes
+ liblttng_ust_provider_ust_tests_demo3_la_SOURCES = tp3.c ust_tests_demo3.h
+-liblttng_ust_provider_ust_tests_demo3_la_LIBADD = -llttng-ust
++liblttng_ust_provider_ust_tests_demo3_la_LIBADD = -llttng-ust -llttng-ust-tracepoint -lurcu-bp -lurcu-cds
+ liblttng_ust_provider_ust_tests_demo3_la_LDFLAGS = $(FORCE_SHARED_LIB_OPTIONS)
+ 
+ noinst_LTLIBRARIES = liblttng-ust-provider-ust-tests-demo.la \
+diff -Nurp lttng-tools-2.6.0.orig/tests/unit/Makefile.am lttng-tools-2.6.0/tests/unit/Makefile.am
+--- lttng-tools-2.6.0.orig/tests/unit/Makefile.am	2015-01-26 09:16:57.000000000 -0800
++++ lttng-tools-2.6.0/tests/unit/Makefile.am	2017-07-10 14:16:58.473772501 -0700
+@@ -67,7 +67,7 @@ UST_DATA_TRACE=$(top_builddir)/src/bin/l
+ 
+ test_ust_data_SOURCES = test_ust_data.c
+ test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM)\
+-		      $(LIBHASHTABLE) -lrt -llttng-ust-ctl
++		      $(LIBHASHTABLE) -lrt -llttng-ust-ctl -lurcu-bp -lurcu-cds
+ test_ust_data_LDADD += $(UST_DATA_TRACE)
+ endif
+ 
+diff -Nurp lttng-tools-2.6.0.orig/tests/utils/testapp/gen-ust-events/Makefile.am lttng-tools-2.6.0/tests/utils/testapp/gen-ust-events/Makefile.am
+--- lttng-tools-2.6.0.orig/tests/utils/testapp/gen-ust-events/Makefile.am	2015-01-26 09:17:15.000000000 -0800
++++ lttng-tools-2.6.0/tests/utils/testapp/gen-ust-events/Makefile.am	2017-07-10 14:16:58.473772501 -0700
+@@ -11,5 +11,5 @@ endif
+ if HAVE_LIBLTTNG_UST_CTL
+ noinst_PROGRAMS = gen-ust-events
+ gen_ust_events_SOURCES = gen-ust-events.c tp.c tp.h
+-gen_ust_events_LDADD = -llttng-ust
++gen_ust_events_LDADD = -llttng-ust -llttng-ust-tracepoint -lurcu-common -lurcu-bp -lurcu-cds
+ endif
+diff -Nurp lttng-tools-2.6.0.orig/tests/utils/testapp/gen-ust-nevents/Makefile.am lttng-tools-2.6.0/tests/utils/testapp/gen-ust-nevents/Makefile.am
+--- lttng-tools-2.6.0.orig/tests/utils/testapp/gen-ust-nevents/Makefile.am	2015-01-26 09:17:15.000000000 -0800
++++ lttng-tools-2.6.0/tests/utils/testapp/gen-ust-nevents/Makefile.am	2017-07-10 14:16:58.473772501 -0700
+@@ -11,5 +11,5 @@ endif
+ if HAVE_LIBLTTNG_UST_CTL
+ noinst_PROGRAMS = gen-ust-nevents
+ gen_ust_nevents_SOURCES = gen-ust-nevents.c tp.c tp.h
+-gen_ust_nevents_LDADD = -llttng-ust
++gen_ust_nevents_LDADD = -llttng-ust -llttng-ust-tracepoint -lurcu-common -lurcu-bp -lurcu-cds
+ endif
+diff -Nurp lttng-tools-2.6.0.orig/tests/utils/testapp/gen-ust-tracef/Makefile.am lttng-tools-2.6.0/tests/utils/testapp/gen-ust-tracef/Makefile.am
+--- lttng-tools-2.6.0.orig/tests/utils/testapp/gen-ust-tracef/Makefile.am	2015-01-26 09:16:57.000000000 -0800
++++ lttng-tools-2.6.0/tests/utils/testapp/gen-ust-tracef/Makefile.am	2017-07-10 14:16:58.473772501 -0700
+@@ -11,5 +11,5 @@ endif
+ if HAVE_LIBLTTNG_UST_CTL
+ noinst_PROGRAMS = gen-ust-tracef
+ gen_ust_tracef_SOURCES = gen-ust-tracef.c
+-gen_ust_tracef_LDADD = -llttng-ust
++gen_ust_tracef_LDADD = -llttng-ust -llttng-ust-tracepoint -lurcu-common -lurcu-bp -lurcu-cds
+ endif
diff --git a/lttng-tools.tar.bz2 b/lttng-tools.tar.bz2
new file mode 100644
index 0000000..db4d25e
--- /dev/null
+++ b/lttng-tools.tar.bz2
Binary files differ
diff --git a/lttng-tools.url b/lttng-tools.url
new file mode 100644
index 0000000..afc1055
--- /dev/null
+++ b/lttng-tools.url
@@ -0,0 +1 @@
+http://lttng.org/files/lttng-tools/lttng-tools-2.6.0.tar.bz2
diff --git a/lttng-tools.version b/lttng-tools.version
new file mode 100644
index 0000000..e70b452
--- /dev/null
+++ b/lttng-tools.version
@@ -0,0 +1 @@
+2.6.0