Index: www/build.html
===================================================================
--- www/build.html
+++ www/build.html
@@ -35,6 +35,8 @@
               </li>
               <li> <a href="http://lab.llvm.org:8011/builders/lldb-x86_64-freebsd">LLDB FreeBSD x86_64 (CMake)</a>
               </li>
+              <li> <a href="http://lab.llvm.org:8011/builders/lldb-amd64-ninja-netbsd7">LLDB NetBSD-7.0 amd64 (GCC 4.8.5, Ninja)</a>
+              </li>
             </ul>
           </p>
         </div>
@@ -44,7 +46,7 @@
           <ul>
             <li><a href="#BuildingLldbOnWindows">Building LLDB on Windows</a></li>
             <li><a href="#BuildingLldbOnMacOSX">Building LLDB on Mac OSX</a></li>
-            <li><a href="#BuildingLldbOnLinux">Building LLDB on Linux and FreeBSD</a></li>
+            <li><a href="#BuildingLldbOnLinux">Building LLDB on Linux, FreeBSD and NetBSD</a></li>
           </ul>
         </div>
         <div class="postfooter"></div>
@@ -165,9 +167,9 @@
           <div class="postfooter"></div>
         </div>
         <div class="post" id="BuildingLldbOnLinux">
-          <h1 class="postheader">Building LLDB on Linux and FreeBSD</h1>
+          <h1 class="postheader">Building LLDB on Linux, FreeBSD and NetBSD</h1>
           <div class="postcontent">
-            <p>This document describes the steps needed to compile LLDB on most Linux systems, and FreeBSD.</a></p>
+            <p>This document describes the steps needed to compile LLDB on most Linux systems, FreeBSD and NetBSD.</a></p>
           </div>
           <div class="postcontent">
             <h2>Preliminaries</h2>
@@ -192,6 +194,10 @@
               or the GCC port or package.
             </p>
             <p>
+              On NetBSD the base system GCC and libstdc++ are used to build LLDB,
+              Clang/LLVM and libc++ should also work.
+            </p>
+            <p>
               In addition to any dependencies required by LLVM and Clang, LLDB needs a few
               development packages that may also need to be installed depending on your
               system.  The current list of dependencies are:
@@ -209,6 +215,8 @@
             <code>&gt; sudo apt-get build-dep lldb-3.3 # or lldb-3.4</code>
             <p>On FreeBSD one might run:</p>
             <code>&gt; pkg install swig python</code>
+            <p>On NetBSD one might run:</p>
+            <code>&gt; pkgin install swig python27 cmake ninja-build</code>
             <p>If you wish to build the optional reference documentation, additional dependencies are required:</p>
             <ul>
               <li> Graphviz (for the 'dot' tool).
@@ -342,11 +350,9 @@
               <h2>Additional Notes</h2>
             </p>
             <p>
-              LLDB has a Python scripting capability and supplies its own Python module named <tt>lldb</tt>.
-              If a script is run inside the command line <tt>lldb</tt> application, the Python module
-              is made available automatically.  However, if a script is to be run by a Python interpreter
-              outside the command line application, the <tt>PYTHONPATH</tt> environment variable can be used
-              to let the Python interpreter find the <tt>lldb</tt> module.
+              Current stable NetBSD release doesn't ship with libpanel(3), therefore it's required to disable curses(3) support with
+              the <tt>-DLLDB_DISABLE_CURSES:BOOL=TRUE</tt> option. To make sure check if <tt>/usr/include/panel.h</tt> exists in your
+              system.
             </p>
             <p>The correct path can be obtained by invoking the command line <tt>lldb</tt> tool with the -P flag:</p>
             <code>&gt; export PYTHONPATH=`$llvm/build/Debug+Asserts/bin/lldb -P`</code>
Index: www/download.html
===================================================================
--- www/download.html
+++ www/download.html
@@ -25,6 +25,11 @@
 						<li>Debian and Ubuntu:
 						<a href="http://llvm.org/apt/">llvm.org/apt</a></li>
 					</ul>
+					<p>The <a href="http://pkgsrc.org">pkgsrc</a> framework offers a package with recent LLDB in the <a href="http://pkgsrc.org/wip">wip</a> repository:</p>
+					<code>
+						cd pkgsrc/wip/lldb-git<br>
+						make install clean
+					</code>
 				</div>
 				<div class="postfooter"></div>
 			</div>
Index: www/index.html
===================================================================
--- www/index.html
+++ www/index.html
@@ -117,6 +117,7 @@
 						<ul>
 								<li>On Mac OS X with Xcode</li>
 								<li>On Linux and FreeBSD (with clang and libstdc++/libc++)</li>
+								<li>On NetBSD (with GCC and clang and libstdc++/libc++)</li>
 								<li>On Windows with VS 2012 or higher using CMake</li>
 						</ul>
 						<p>See the <a href="build.html">LLDB Build Page</a> for platform-specific build instructions.</p>
Index: www/status.html
===================================================================
--- www/status.html
+++ www/status.html
@@ -48,7 +48,7 @@
 				<div class="postcontent">
 					<p> The table below shows a summary of the features that are available
 					on several platforms. In addition to Linux and Mac OS X, LLDB is also
-					known to work on FreeBSD. Windows support is under development.
+					known to work on FreeBSD. Windows and NetBSD support is under development.
 							<table border="1">
 								<tr>
 									<th>Feature</th>
Index: www/test.html
===================================================================
--- www/test.html
+++ www/test.html
@@ -42,6 +42,8 @@
               <br />&gt; ninja check-lldb
             </code>
             <p>Note that multiple -A and -C flags can be specified to <tt>LLDB_TEST_USER_ARGS</tt>.</p>
+            <p>Note that on NetBSD you must export <tt>LD_LIBRARY_PATH=$PWD/lib</tt> in your environment. This is due to lack of
+               the <tt>$ORIGIN</tt> linker feature.</p>
             <p>
               In addition to running all the LLDB test suites with the "check-lldb" CMake target above, it is possible to
               run individual LLDB tests. For example, to run the test cases defined in TestInferiorCrashing.py, run: