diff --git a/LICENSE b/LICENSE
index b67d9091009..261eeb9e9f8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Apache License
+                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
@@ -178,7 +178,7 @@ Apache License
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
+      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
@@ -186,7 +186,7 @@ Apache License
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {}
+   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.
diff --git a/license.template b/etc/license.template
similarity index 100%
rename from license.template
rename to etc/license.template
diff --git a/rustfmt.toml b/rustfmt.toml
index 4dc50c8536e..4b1fcf23f31 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -2,7 +2,7 @@ version = "Two"
 unstable_features = true
 
 condense_wildcard_suffixes = true
-license_template_path = "license.template"
+license_template_path = "etc/license.template"
 newline_style = "Unix"
 use_field_init_shorthand = true
 use_try_shorthand = true