diff -Nru llvm-toolchain-6.0-6.0/debian/changelog llvm-toolchain-6.0-6.0/debian/changelog
--- llvm-toolchain-6.0-6.0/debian/changelog	2018-03-12 08:12:11.000000000 +0000
+++ llvm-toolchain-6.0-6.0/debian/changelog	2018-04-05 22:05:20.000000000 +0000
@@ -1,3 +1,11 @@
+llvm-toolchain-6.0 (1:6.0-1ubuntu2) bionic; urgency=medium
+
+  * debian/patches/install-lldb-sb-headers.patch: Install lldb's
+    SB headers (pr36630).  Thanks to Pavel Labath <labath@google.com>.
+    LP: #1761009
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Thu, 05 Apr 2018 15:05:20 -0700
+
 llvm-toolchain-6.0 (1:6.0-1ubuntu1) bionic; urgency=medium
 
   * Don't run the Sanitizer tests on the Ubuntu buildds, timing out.
diff -Nru llvm-toolchain-6.0-6.0/debian/control llvm-toolchain-6.0-6.0/debian/control
--- llvm-toolchain-6.0-6.0/debian/control	2018-02-26 15:09:44.000000000 +0000
+++ llvm-toolchain-6.0-6.0/debian/control	2018-04-05 22:05:20.000000000 +0000
@@ -1,7 +1,8 @@
 Source: llvm-toolchain-6.0
 Section: devel
 Priority: optional
-Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
 Uploaders: Sylvestre Ledru <sylvestre@debian.org>
 Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect,
     cmake, perl, libtool, chrpath, texinfo, sharutils, libffi-dev (>= 3.0.9),
diff -Nru llvm-toolchain-6.0-6.0/debian/patches/install-lldb-sb-headers.patch llvm-toolchain-6.0-6.0/debian/patches/install-lldb-sb-headers.patch
--- llvm-toolchain-6.0-6.0/debian/patches/install-lldb-sb-headers.patch	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-6.0-6.0/debian/patches/install-lldb-sb-headers.patch	2018-04-05 22:05:20.000000000 +0000
@@ -0,0 +1,58 @@
+From 8f577000b2fe2f5bf5d08e352a2f15f9421f9c82 Mon Sep 17 00:00:00 2001
+From: Pavel Labath <labath@google.com>
+Date: Thu, 8 Mar 2018 15:52:46 +0000
+Subject: [PATCH] Install lldb's SB headers (pr36630)
+
+These were removed in r309021 in what looks like an accidentally
+committed change. This brings them back.
+
+I also rename the header component to lldb-headers (instead of
+lldb_headers) to match the llvm style and add a special
+install-lldb-headers target, which installs just the headers.
+
+git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@327016 91177308-0d34-0410-b5e6-96231b3b80d8
+Origin: upstream, https://github.com/llvm-mirror/lldb/commit/8f577000b2fe2f5bf5d08e352a2f15f9421f9c82.patch
+Bug-Ubuntu: https://launchpad.net/bugs/1761009
+Forwarded: will be done by Nishanth Aravamudan
+Last-Update: 2018-04-05
+
+--- llvm-toolchain-6.0-6.0.orig/lldb/cmake/modules/LLDBConfig.cmake
++++ llvm-toolchain-6.0-6.0/lldb/cmake/modules/LLDBConfig.cmake
+@@ -277,27 +277,31 @@ include_directories(BEFORE
+ 
+ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
+   install(DIRECTORY include/
+-    COMPONENT lldb_headers
++    COMPONENT lldb-headers
+     DESTINATION include
+     FILES_MATCHING
+     PATTERN "*.h"
+     PATTERN ".svn" EXCLUDE
+     PATTERN ".cmake" EXCLUDE
+     PATTERN "Config.h" EXCLUDE
+-    PATTERN "lldb-*.h" EXCLUDE
+-    PATTERN "API/*.h" EXCLUDE
+     )
+ 
+   install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/
+-    COMPONENT lldb_headers
++    COMPONENT lldb-headers
+     DESTINATION include
+     FILES_MATCHING
+     PATTERN "*.h"
+     PATTERN ".svn" EXCLUDE
+     PATTERN ".cmake" EXCLUDE
+-    PATTERN "lldb-*.h" EXCLUDE
+-    PATTERN "API/*.h" EXCLUDE
+     )
++
++  add_custom_target(lldb-headers)
++  set_target_properties(lldb-headers PROPERTIES FOLDER "Misc")
++
++  if (NOT CMAKE_CONFIGURATION_TYPES)
++    add_llvm_install_targets(install-lldb-headers
++                             COMPONENT lldb-headers)
++  endif()
+ endif()
+ 
+ if (NOT LIBXML2_FOUND AND NOT (CMAKE_SYSTEM_NAME MATCHES "Windows"))
diff -Nru llvm-toolchain-6.0-6.0/debian/patches/series llvm-toolchain-6.0-6.0/debian/patches/series
--- llvm-toolchain-6.0-6.0/debian/patches/series	2018-02-27 08:08:44.000000000 +0000
+++ llvm-toolchain-6.0-6.0/debian/patches/series	2018-04-05 22:03:28.000000000 +0000
@@ -47,3 +47,4 @@
 silent-llvm-isel-fuzzer.diff
 test-keep-alive.diff
 sparc64-add-missing-tls-get-addr.diff
+install-lldb-sb-headers.patch