diff --git a/LICENSE b/LICENSE
index f409fd84e6..2f69b1fe06 100644
--- a/LICENSE
+++ b/LICENSE
@@ -176,93 +176,14 @@
 
    END OF TERMS AND CONDITIONS
 
-   APPENDIX: How to apply the Apache License to your work.
+Additional License files can be found in the 'licenses' folder located in the same directory as the LICENSE file (i.e. this file)
 
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
+- Software produced outside the ASF which is available under other licenses (not Apache-2.0)
 
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-
-
-
------------------------------------------------------------------------
-
-APACHE CALCITE AVATICA SUBCOMPONENTS:
-
-The Apache Calcite Avatica project contains subcomponents with separate copyright
-notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following
-licenses.
-
------------------------------------------------------------------------
- The MIT License
------------------------------------------------------------------------
-
-The Apache Calcite project bundles the following files under the MIT License:
-
-- site
-    Parts of the web site generated by Jekyll (http://jekyllrb.com/)
-    Copyright (c) 2008-2015 Tom Preston-Werner
-- site/_sass/_font-awesome.scss
-    Font-awesome css files v4.1.0 (http://fortawesome.github.io/Font-Awesome/)
-    Copyright (c) 2013  Dave Gandy
-- site/_sass/_normalize.scss
-    normalize.css v3.0.2 | git.io/normalize
-    Copyright (c) Nicolas Gallagher and Jonathan Neal
-- site/_sass/_gridism.scss
-    Gridism: A simple, responsive, and handy CSS grid by @cobyism
-    https://github.com/cobyism/gridism
-    Copyright (c) 2013 Coby Chapple
-- site/js/html5shiv.min.js
-    HTML5 Shiv 3.7.2 | @afarkas @jdalton @jon_neal @rem
-- site/js/respond.min.js
-    Respond.js v1.4.2: min/max-width media query polyfill
-    Copyright 2013 Scott Jehl
-
-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.
-
------------------------------------------------------------------------
- The Open Font License
------------------------------------------------------------------------
-
-The Apache Calcite project bundles the following fonts under the
-SIL Open Font License (OFL) - http://scripts.sil.org/OFL/
-
-- site/fonts/fontawesome-webfont.*
-   Font-awesome font files v4.0.3 (http://fortawesome.github.io/Font-Awesome/)
+MIT
+* cobyism:html5shiv:3.7.2
+* font-awesome:font-awesome-code:4.2.0
+* gridsim:gridsim:
+* jekyll:jekyll:
+* normalize:normalize:3.0.2
+* respond:respond:1.4.2
diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index 1a7748f010..814af53470 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -277,6 +277,7 @@ docker-compose run -v /c/Users/username/AppData/Roaming/gnupg:/.gnupg publish-re
 * That directory must contain files `NOTICE`, `LICENSE`,
   `README`, `README.md`
   * Check that the version in `README` is correct
+  * Check that `LICENSE` is identical to the file checked into git
 * Make sure that the following files do not occur in the source
   distros: `KEYS`, `gradlew`, `gradlew.bat`, `gradle-wrapper.jar`,
   `gradle-wrapper.properties`