diff --git a/NOTICE b/NOTICE
index 6f5297e2e..27a575311 100644
--- a/NOTICE
+++ b/NOTICE
@@ -2,7 +2,8 @@ Simple Build Tool (xsbt)
 Copyright 2008, 2009, 2010 Mark Harrah
 Licensed under BSD-style license (see LICENSE)
 
-Portions based on code from the Scala compiler
+Portions based on code from the Scala compiler.  Portions of the Scala
+library are distributed with the launcher.
 Copyright 2002-2008 EPFL, Lausanne
 Licensed under BSD-style license (see licenses/LICENSE_Scala)
 
diff --git a/cache/NOTICE b/cache/NOTICE
new file mode 100644
index 000000000..8f0040336
--- /dev/null
+++ b/cache/NOTICE
@@ -0,0 +1,3 @@
+Simple Build Tool: Cache Component
+Copyright 2009  Mark Harrah
+Licensed under BSD-style license (see LICENSE)
\ No newline at end of file
diff --git a/cache/tracking/NOTICE b/cache/tracking/NOTICE
new file mode 100644
index 000000000..c7c0531d9
--- /dev/null
+++ b/cache/tracking/NOTICE
@@ -0,0 +1,3 @@
+Simple Build Tool: Tracking Component
+Copyright 2009, 2010  Mark Harrah
+Licensed under BSD-style license (see LICENSE)
\ No newline at end of file
diff --git a/util/collection/HLists.scala b/util/collection/HLists.scala
index f376ee4fd..69ac9d6da 100644
--- a/util/collection/HLists.scala
+++ b/util/collection/HLists.scala
@@ -1,8 +1,8 @@
-package xsbt
-
 // stripped down version of http://trac.assembla.com/metascala/browser/src/metascala/HLists.scala
 //   Copyright (c) 2009, Jesper Nordenberg
-//   new BSD license, see licenses/MetaScala
+//   new BSD license, see licenses/LICENSE_MetaScala
+
+package xsbt
 
 object HLists extends HLists
 trait HLists
diff --git a/util/collection/NOTICE b/util/collection/NOTICE
new file mode 100644
index 000000000..ddfa4614d
--- /dev/null
+++ b/util/collection/NOTICE
@@ -0,0 +1,7 @@
+Simple Build Tool: Collection Component
+Copyright 2009  Mark Harrah
+Licensed under BSD-style license (see LICENSE)
+
+Portions based on MetaScala
+Copyright (c) 2009, Jesper Nordenberg
+Licensed under BSD-style license (see licenses/LICENSE_MetaScala)
\ No newline at end of file
diff --git a/util/collection/TreeHashSet.scala b/util/collection/TreeHashSet.scala
index f84981174..d45a0acfb 100644
--- a/util/collection/TreeHashSet.scala
+++ b/util/collection/TreeHashSet.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
 package xsbt
 
 import scala.collection.{mutable,immutable}
diff --git a/util/control/ErrorHandling.scala b/util/control/ErrorHandling.scala
index fd8b6e69c..98c1b1a73 100644
--- a/util/control/ErrorHandling.scala
+++ b/util/control/ErrorHandling.scala
@@ -1,3 +1,6 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
 package xsbt
 
 object ErrorHandling
diff --git a/util/control/NOTICE b/util/control/NOTICE
new file mode 100644
index 000000000..76a30965a
--- /dev/null
+++ b/util/control/NOTICE
@@ -0,0 +1,3 @@
+Simple Build Tool: Control Component
+Copyright 2009  Mark Harrah
+Licensed under BSD-style license (see LICENSE)
\ No newline at end of file
diff --git a/util/log/NOTICE b/util/log/NOTICE
new file mode 100644
index 000000000..1a42b7a31
--- /dev/null
+++ b/util/log/NOTICE
@@ -0,0 +1,3 @@
+Simple Build Tool: Logging Component
+Copyright 2008, 2009  Mark Harrah
+Licensed under BSD-style license (see LICENSE)
\ No newline at end of file