diff --git a/Dockerfile b/Dockerfile
index 6d86de974..fb3d5cc94 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,9 @@ LABEL maintainer "dev@pilosa.com"
 
 COPY --from=builder /go/bin/pilosa /pilosa
 
+COPY LICENSE /LICENSE
+COPY NOTICE /NOTICE
+
 EXPOSE 10101
 VOLUME /data
 
diff --git a/Makefile b/Makefile
index 48c0075a8..a76225bd8 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ ifdef DOCKER_BUILD
 else
 	make pilosa FLAGS="-o build/pilosa-$(IDENTIFIER)/pilosa"
 endif
-	cp LICENSE README.md build/pilosa-$(IDENTIFIER)
+	cp NOTICE LICENSE README.md build/pilosa-$(IDENTIFIER)
 	tar -cvz -C build -f build/pilosa-$(IDENTIFIER).tar.gz pilosa-$(IDENTIFIER)/
 	@echo "Created release build: build/pilosa-$(IDENTIFIER).tar.gz"
 
@@ -76,7 +76,7 @@ endif
 
 prerelease-build: vendor
 	make pilosa FLAGS="-o build/pilosa-master-$(GOOS)-$(GOARCH)/pilosa"
-	cp LICENSE README.md build/pilosa-master-$(GOOS)-$(GOARCH)
+	cp NOTICE LICENSE README.md build/pilosa-master-$(GOOS)-$(GOARCH)
 	tar -cvz -C build -f build/pilosa-master-$(GOOS)-$(GOARCH).tar.gz pilosa-master-$(GOOS)-$(GOARCH)/
 	@echo "Created pre-release build: build/pilosa-master-$(GOOS)-$(GOARCH).tar.gz"
 
diff --git a/NOTICE b/NOTICE
index 365e87c82..b93e9a17d 100644
--- a/NOTICE
+++ b/NOTICE
@@ -18,8 +18,33 @@ limitations under the License.
 Third-party software licenses
 =============================
 
-The file /pilosa/roaring/btree.go is licensed under the BSD 3-Clause license,
-which can be found at:
+The file /pilosa/roaring/btree.go contains a modified redistribution of b
+(https://github.com/cznic/b); the license follows:
 
-    https://github.com/cznic/b/blob/master/LICENSE
+    Copyright (c) 2014 The b Authors. All rights reserved.
 
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+
+       * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+       * Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following disclaimer
+    in the documentation and/or other materials provided with the
+    distribution.
+       * Neither the names of the authors nor the names of the
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/roaring/btree.go b/roaring/btree.go
index 24fd76507..e3646113b 100644
--- a/roaring/btree.go
+++ b/roaring/btree.go
@@ -1,7 +1,33 @@
-// Copyright 2014 The b Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found at:
-// https://github.com/cznic/b/blob/master/LICENSE
+// This file is a modified redistribution of b (https://github.com/cznic/b),
+// which is governed by the following license notice:
+//
+// Copyright (c) 2014 The b Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the names of the authors nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package roaring