diff --git a/LICENSE b/LICENSE
index f63be51854..f9a8e9f88d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -5,8 +5,8 @@ in this file.
 Intent
 ======
 
-Parts of Sandstrom are licensed under a liberal 2-clause BSD license while
-other parts are under the GNU AGPL (yes, the "Peanut Butter Hola Hoops"
+Parts of Sandstrom are licensed under the liberal MIT License while
+other parts are under the GNU AGPL (yes, the "Peanut Butter Hoola Hoops"
 license; http://cl.ly/5nAo).  The intent is that Sandstorm applications
 should be allowed to be licensed in any way the author chooses, but
 modifications to the platform itself must remain open source.  Also, like
@@ -29,7 +29,7 @@ src/sandstorm/legacy-bridge.c++
     What: Sandstorm API and embedded tools
     Source URL: https://sandstorm.io
     Copyright: Kenton Varda
-    License: BSD 2-clause
+    License: MIT
     License text: See below
 
 All files not explicitly mentioned above or below
@@ -93,33 +93,30 @@ if in doubt, just ask Kenton first.  Kenton is likely to be reasonable.  :)
 
 =======================================================================
 Sandstorm API and embedded tools
-License: BSD 2-Clause
-
-Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-2. 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.
-
-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.
+License: MIT
+
+Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 
 =======================================================================
-Sandstorm implementation
+Sandstorm server implementation
 License: GNU AGPL v3
 
                     GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/shell/client/shell.css b/shell/client/shell.css
index 3f3d2192c3..6f42c81e19 100644
--- a/shell/client/shell.css
+++ b/shell/client/shell.css
@@ -1,5 +1,5 @@
 /* Sandstorm - Personal Cloud Sandbox
- * Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+ * Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
  * All rights reserved.
  *
  * This file is part of the Sandstorm platform implementation.
diff --git a/shell/client/shell.html b/shell/client/shell.html
index c22abf7075..479b10b24a 100644
--- a/shell/client/shell.html
+++ b/shell/client/shell.html
@@ -1,6 +1,6 @@
 <!--
 Sandstorm - Personal Cloud Sandbox
-Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 All rights reserved.
 
 This file is part of the Sandstorm platform implementation.
diff --git a/shell/server/installer.js b/shell/server/installer.js
index 622cda7cce..d081caf0d8 100644
--- a/shell/server/installer.js
+++ b/shell/server/installer.js
@@ -1,5 +1,5 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 // All rights reserved.
 //
 // This file is part of the Sandstorm platform implementation.
diff --git a/shell/server/mail.js b/shell/server/mail.js
index 49383536c3..a2d6113271 100644
--- a/shell/server/mail.js
+++ b/shell/server/mail.js
@@ -1,5 +1,5 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 // All rights reserved.
 //
 // This file is part of the Sandstorm platform implementation.
diff --git a/shell/server/proxy.js b/shell/server/proxy.js
index 099e531c3f..04e3a1559b 100644
--- a/shell/server/proxy.js
+++ b/shell/server/proxy.js
@@ -1,5 +1,5 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 // All rights reserved.
 //
 // This file is part of the Sandstorm platform implementation.
diff --git a/shell/server/static-web.js b/shell/server/static-web.js
index 8e5dfee34f..fe6d0a46b4 100644
--- a/shell/server/static-web.js
+++ b/shell/server/static-web.js
@@ -1,5 +1,5 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 // All rights reserved.
 //
 // This file is part of the Sandstorm platform implementation.
diff --git a/shell/shared/db.js b/shell/shared/db.js
index 96d2b84528..e160d57b94 100644
--- a/shell/shared/db.js
+++ b/shell/shared/db.js
@@ -1,5 +1,5 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 // All rights reserved.
 //
 // This file is part of the Sandstorm platform implementation.
diff --git a/shell/shared/grain.js b/shell/shared/grain.js
index eb18b9a914..854bea640c 100644
--- a/shell/shared/grain.js
+++ b/shell/shared/grain.js
@@ -1,5 +1,5 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 // All rights reserved.
 //
 // This file is part of the Sandstorm platform implementation.
diff --git a/shell/shared/install.js b/shell/shared/install.js
index 712dd8ba93..fadaf4f7fd 100644
--- a/shell/shared/install.js
+++ b/shell/shared/install.js
@@ -1,5 +1,5 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 // All rights reserved.
 //
 // This file is part of the Sandstorm platform implementation.
diff --git a/shell/shared/shell.js b/shell/shared/shell.js
index c8df84f9af..f7ed1b5463 100644
--- a/shell/shared/shell.js
+++ b/shell/shared/shell.js
@@ -1,5 +1,5 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 // All rights reserved.
 //
 // This file is part of the Sandstorm platform implementation.
diff --git a/shell/shared/signup.js b/shell/shared/signup.js
index c0094faca5..d0962aa221 100644
--- a/shell/shared/signup.js
+++ b/shell/shared/signup.js
@@ -1,5 +1,5 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 // All rights reserved.
 //
 // This file is part of the Sandstorm platform implementation.
diff --git a/shell/shared/stats.js b/shell/shared/stats.js
index 459241efd6..2e2f79ad14 100644
--- a/shell/shared/stats.js
+++ b/shell/shared/stats.js
@@ -1,5 +1,5 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 // All rights reserved.
 //
 // This file is part of the Sandstorm platform implementation.
diff --git a/src/sandstorm/email.capnp b/src/sandstorm/email.capnp
index 118bfb600e..ebae074593 100644
--- a/src/sandstorm/email.capnp
+++ b/src/sandstorm/email.capnp
@@ -1,28 +1,25 @@
 # Sandstorm - Personal Cloud Sandbox
-# Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
-# All rights reserved.
+# Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 #
-# This file is part of the Sandstorm API, which is licensed as follows.
+# This file is part of the Sandstorm API, which is licensed under the MIT license:
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. 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.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# 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.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 @0xdd10df585a82c6d8;
 
diff --git a/src/sandstorm/fuse-test-bind.c++ b/src/sandstorm/fuse-test-bind.c++
index e3723d4a48..8ba8067b5c 100644
--- a/src/sandstorm/fuse-test-bind.c++
+++ b/src/sandstorm/fuse-test-bind.c++
@@ -1,5 +1,5 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 // All rights reserved.
 //
 // This file is part of the Sandstorm platform implementation.
diff --git a/src/sandstorm/fuse.c++ b/src/sandstorm/fuse.c++
index 2726461539..746c080cca 100644
--- a/src/sandstorm/fuse.c++
+++ b/src/sandstorm/fuse.c++
@@ -1,5 +1,5 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 // All rights reserved.
 //
 // This file is part of the Sandstorm platform implementation.
diff --git a/src/sandstorm/fuse.capnp b/src/sandstorm/fuse.capnp
index 504e8ab1a0..212ad797e9 100644
--- a/src/sandstorm/fuse.capnp
+++ b/src/sandstorm/fuse.capnp
@@ -1,5 +1,5 @@
 # Sandstorm - Personal Cloud Sandbox
-# Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+# Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 # All rights reserved.
 #
 # This file is part of the Sandstorm platform implementation.
diff --git a/src/sandstorm/fuse.h b/src/sandstorm/fuse.h
index df022c7700..186f3afc1e 100644
--- a/src/sandstorm/fuse.h
+++ b/src/sandstorm/fuse.h
@@ -1,5 +1,5 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 // All rights reserved.
 //
 // This file is part of the Sandstorm platform implementation.
diff --git a/src/sandstorm/grain.capnp b/src/sandstorm/grain.capnp
index 986731f2c6..3698ee22f1 100644
--- a/src/sandstorm/grain.capnp
+++ b/src/sandstorm/grain.capnp
@@ -1,28 +1,25 @@
 # Sandstorm - Personal Cloud Sandbox
-# Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
-# All rights reserved.
+# Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 #
-# This file is part of the Sandstorm API, which is licensed as follows.
+# This file is part of the Sandstorm API, which is licensed under the MIT license:
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. 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.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# 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.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 @0xc8d91463cfc4fb4a;
 
diff --git a/src/sandstorm/hack-session.capnp b/src/sandstorm/hack-session.capnp
index 7c8b9193ab..d65ca24711 100644
--- a/src/sandstorm/hack-session.capnp
+++ b/src/sandstorm/hack-session.capnp
@@ -1,28 +1,25 @@
 # Sandstorm - Personal Cloud Sandbox
-# Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
-# All rights reserved.
+# Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 #
-# This file is part of the Sandstorm API, which is licensed as follows.
+# This file is part of the Sandstorm API, which is licensed under the MIT license:
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. 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.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# 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.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 @0xbf6889795837d1e0;
 # This file defines some hacks added on top of the grain session protocol designed to expose some
diff --git a/src/sandstorm/js.ekam-rule b/src/sandstorm/js.ekam-rule
index 4550ec77b8..02d6616807 100755
--- a/src/sandstorm/js.ekam-rule
+++ b/src/sandstorm/js.ekam-rule
@@ -1,30 +1,27 @@
 #! /bin/sh
 
 # Sandstorm - Personal Cloud Sandbox
-# Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
-# All rights reserved.
+# Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 #
-# This file is part of the Sandstorm API, which is licensed as follows.
+# This file is part of the Sandstorm API, which is licensed under the MIT license:
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. 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.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# 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.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 set -eu
 
diff --git a/src/sandstorm/jstest.ekam-rule b/src/sandstorm/jstest.ekam-rule
index 3d7e0532de..330ce089e6 100755
--- a/src/sandstorm/jstest.ekam-rule
+++ b/src/sandstorm/jstest.ekam-rule
@@ -1,30 +1,27 @@
 #! /bin/sh
 
 # Sandstorm - Personal Cloud Sandbox
-# Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
-# All rights reserved.
+# Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 #
-# This file is part of the Sandstorm API, which is licensed as follows.
+# This file is part of the Sandstorm API, which is licensed under the MIT license:
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. 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.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# 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.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 set -eu
 
diff --git a/src/sandstorm/package.capnp b/src/sandstorm/package.capnp
index 3db326b88f..c5a93090e7 100644
--- a/src/sandstorm/package.capnp
+++ b/src/sandstorm/package.capnp
@@ -1,28 +1,25 @@
 # Sandstorm - Personal Cloud Sandbox
-# Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
-# All rights reserved.
+# Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 #
-# This file is part of the Sandstorm API, which is licensed as follows.
+# This file is part of the Sandstorm API, which is licensed under the MIT license:
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. 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.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# 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.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 @0xdf9bc20172856a3a;
 # This file contains schemas relevant to the Sandstorm package format.  See also the `spk` tool.
diff --git a/src/sandstorm/run-bundle.c++ b/src/sandstorm/run-bundle.c++
index 889f7bbfc0..2db85bd7b4 100644
--- a/src/sandstorm/run-bundle.c++
+++ b/src/sandstorm/run-bundle.c++
@@ -1,5 +1,5 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 // All rights reserved.
 //
 // This file is part of the Sandstorm platform implementation.
diff --git a/src/sandstorm/sandstorm-http-bridge.c++ b/src/sandstorm/sandstorm-http-bridge.c++
index 5be0bd47c7..49eab06fed 100644
--- a/src/sandstorm/sandstorm-http-bridge.c++
+++ b/src/sandstorm/sandstorm-http-bridge.c++
@@ -1,28 +1,25 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
-// All rights reserved.
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 //
-// This file is part of the Sandstorm API, which is licensed as follows.
+// This file is part of the Sandstorm API, which is licensed under the MIT license:
 //
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
 //
-// 1. Redistributions of source code must retain the above copyright notice, this
-//    list of conditions and the following disclaimer.
-// 2. 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.
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
 //
-// 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.
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 
 // This program is useful for including in Sandstorm application packages where
 // the application itself is a legacy HTTP web server that does not understand
diff --git a/src/sandstorm/send-fd.c++ b/src/sandstorm/send-fd.c++
index bb6f81ea2f..586fbdad67 100644
--- a/src/sandstorm/send-fd.c++
+++ b/src/sandstorm/send-fd.c++
@@ -1,5 +1,5 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 // All rights reserved.
 //
 // This file is part of the Sandstorm platform implementation.
diff --git a/src/sandstorm/send-fd.h b/src/sandstorm/send-fd.h
index 0f6c4b11d1..1666ef56b6 100644
--- a/src/sandstorm/send-fd.h
+++ b/src/sandstorm/send-fd.h
@@ -1,5 +1,5 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 // All rights reserved.
 //
 // This file is part of the Sandstorm platform implementation.
diff --git a/src/sandstorm/spk.c++ b/src/sandstorm/spk.c++
index 585de48299..5f3f33f8db 100644
--- a/src/sandstorm/spk.c++
+++ b/src/sandstorm/spk.c++
@@ -1,5 +1,5 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 // All rights reserved.
 //
 // This file is part of the Sandstorm platform implementation.
diff --git a/src/sandstorm/supervisor-main.c++ b/src/sandstorm/supervisor-main.c++
index b7240eecd7..72b16486af 100644
--- a/src/sandstorm/supervisor-main.c++
+++ b/src/sandstorm/supervisor-main.c++
@@ -1,5 +1,5 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 // All rights reserved.
 //
 // This file is part of the Sandstorm platform implementation.
diff --git a/src/sandstorm/supervisor.capnp b/src/sandstorm/supervisor.capnp
index 3e5e3b41a0..65fe415792 100644
--- a/src/sandstorm/supervisor.capnp
+++ b/src/sandstorm/supervisor.capnp
@@ -1,28 +1,25 @@
 # Sandstorm - Personal Cloud Sandbox
-# Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
-# All rights reserved.
+# Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 #
-# This file is part of the Sandstorm API, which is licensed as follows.
+# This file is part of the Sandstorm API, which is licensed under the MIT license:
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. 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.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# 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.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 @0xc7205d6d32c7b040;
 
diff --git a/src/sandstorm/union-fs.c++ b/src/sandstorm/union-fs.c++
index 27e7e5c586..f9d716f2c5 100644
--- a/src/sandstorm/union-fs.c++
+++ b/src/sandstorm/union-fs.c++
@@ -1,5 +1,5 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 // All rights reserved.
 //
 // This file is part of the Sandstorm platform implementation.
diff --git a/src/sandstorm/union-fs.h b/src/sandstorm/union-fs.h
index 77300b651c..8b931f9dd9 100644
--- a/src/sandstorm/union-fs.h
+++ b/src/sandstorm/union-fs.h
@@ -1,5 +1,5 @@
 // Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 // All rights reserved.
 //
 // This file is part of the Sandstorm platform implementation.
diff --git a/src/sandstorm/util.capnp b/src/sandstorm/util.capnp
index ab380b40ab..b02bc9e044 100644
--- a/src/sandstorm/util.capnp
+++ b/src/sandstorm/util.capnp
@@ -1,28 +1,25 @@
 # Sandstorm - Personal Cloud Sandbox
-# Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
-# All rights reserved.
+# Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 #
-# This file is part of the Sandstorm API, which is licensed as follows.
+# This file is part of the Sandstorm API, which is licensed under the MIT license:
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. 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.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# 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.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 @0xecd50d792c3d9992;
 
diff --git a/src/sandstorm/web-session.capnp b/src/sandstorm/web-session.capnp
index a8418a0f2b..dad729e9de 100644
--- a/src/sandstorm/web-session.capnp
+++ b/src/sandstorm/web-session.capnp
@@ -1,28 +1,25 @@
 # Sandstorm - Personal Cloud Sandbox
-# Copyright (c) 2014, Kenton Varda <temporal@gmail.com>
-# All rights reserved.
+# Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
 #
-# This file is part of the Sandstorm API, which is licensed as follows.
+# This file is part of the Sandstorm API, which is licensed under the MIT license:
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. 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.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# 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.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 @0xa8cb0f2f1a756b32;