diff --git a/config/config.go b/config/config.go
index fa1b0fe..e5068b7 100644
--- a/config/config.go
+++ b/config/config.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 
 // Package config contains support for Amsterdam site-wide configuration data.
diff --git a/config/default.yaml b/config/default.yaml
index 32d1a65..f2e48e1 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -6,6 +6,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 #
+# SPDX-Licenrse-Identifier: MPL-2.0
+#
 site:
   production: false
   listen: ":1323"
diff --git a/config/fpath_mac.go b/config/fpath_mac.go
index f17c464..21378e9 100644
--- a/config/fpath_mac.go
+++ b/config/fpath_mac.go
@@ -7,6 +7,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 
 // Package config contains support for Amsterdam site-wide configuration data.
diff --git a/config/fpath_unix.go b/config/fpath_unix.go
index 1e8f4fa..6d767a1 100644
--- a/config/fpath_unix.go
+++ b/config/fpath_unix.go
@@ -7,6 +7,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 
 // Package config contains support for Amsterdam site-wide configuration data.
diff --git a/config/fpath_windows.go b/config/fpath_windows.go
index bd352b8..dbddea4 100644
--- a/config/fpath_windows.go
+++ b/config/fpath_windows.go
@@ -7,6 +7,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 
 // Package config contains support for Amsterdam site-wide configuration data.
diff --git a/database/adverts.go b/database/adverts.go
index 5278df3..ac93c5e 100644
--- a/database/adverts.go
+++ b/database/adverts.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/database/audit.go b/database/audit.go
index 7f5b46d..d0efb00 100644
--- a/database/audit.go
+++ b/database/audit.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/database/auditref.yaml b/database/auditref.yaml
index a53c532..a4d5bed 100644
--- a/database/auditref.yaml
+++ b/database/auditref.yaml
@@ -6,6 +6,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 #
+# SPDX-Licenrse-Identifier: MPL-2.0
+#
 # ----------------------------------------------------------------------------
 # N.B.: Keep this synchronized with the constant definitions in
 # database/audit.go at all times!
diff --git a/database/base.go b/database/base.go
index 20c4ce0..9bd49f0 100644
--- a/database/base.go
+++ b/database/base.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/database/category.go b/database/category.go
index 39accd9..9aec7bd 100644
--- a/database/category.go
+++ b/database/category.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/database/community.go b/database/community.go
index 0f87c33..7c30863 100644
--- a/database/community.go
+++ b/database/community.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/database/conference.go b/database/conference.go
index 913a949..1b93e2a 100644
--- a/database/conference.go
+++ b/database/conference.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/database/contactinfo.go b/database/contactinfo.go
index 8ccef2a..7247d6a 100644
--- a/database/contactinfo.go
+++ b/database/contactinfo.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/database/emailban.go b/database/emailban.go
index 70494f4..045d5e2 100644
--- a/database/emailban.go
+++ b/database/emailban.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/database/globals.go b/database/globals.go
index 961d19f..a8b1126 100644
--- a/database/globals.go
+++ b/database/globals.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/database/hotlist.go b/database/hotlist.go
index 3af5666..53125d9 100644
--- a/database/hotlist.go
+++ b/database/hotlist.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/database/imagestore.go b/database/imagestore.go
index 4010fa6..2758c89 100644
--- a/database/imagestore.go
+++ b/database/imagestore.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/database/ipban.go b/database/ipban.go
index a87afa4..932d76b 100644
--- a/database/ipban.go
+++ b/database/ipban.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/database/passchange.go b/database/passchange.go
index 2d7621f..0eef39e 100644
--- a/database/passchange.go
+++ b/database/passchange.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/database/post.go b/database/post.go
index cbc9684..0c28cf8 100644
--- a/database/post.go
+++ b/database/post.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/database/post_link.go b/database/post_link.go
index a6ed333..0eeff99 100644
--- a/database/post_link.go
+++ b/database/post_link.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/database/security.go b/database/security.go
index 4193621..fd92703 100644
--- a/database/security.go
+++ b/database/security.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/database/securitydefs.yaml b/database/securitydefs.yaml
index 4406ffb..23eb0ac 100644
--- a/database/securitydefs.yaml
+++ b/database/securitydefs.yaml
@@ -6,6 +6,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 #
+# SPDX-Licenrse-Identifier: MPL-2.0
+#
 scopes:
   - name: Global
     index: 0
diff --git a/database/servicedefs.yaml b/database/servicedefs.yaml
index 8edbf65..b96e3ed 100644
--- a/database/servicedefs.yaml
+++ b/database/servicedefs.yaml
@@ -6,6 +6,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 #
+# SPDX-Licenrse-Identifier: MPL-2.0
+#
 domains:
   - domain: "community"
     services:
diff --git a/database/services.go b/database/services.go
index 3123d6f..604698d 100644
--- a/database/services.go
+++ b/database/services.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/database/sidebox.go b/database/sidebox.go
index 4739428..bfdc0ff 100644
--- a/database/sidebox.go
+++ b/database/sidebox.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/database/topic.go b/database/topic.go
index 8ea7122..2623629 100644
--- a/database/topic.go
+++ b/database/topic.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/database/user.go b/database/user.go
index 08f9c51..151955f 100644
--- a/database/user.go
+++ b/database/user.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/database/validate.go b/database/validate.go
index a1cd867..1835986 100644
--- a/database/validate.go
+++ b/database/validate.go
@@ -5,6 +5,8 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
 // The database package contains database management and storage logic.
 package database
diff --git a/docs/templates/go-header.txt b/docs/templates/go-header.txt
index cca5197..15a7562 100644
--- a/docs/templates/go-header.txt
+++ b/docs/templates/go-header.txt
@@ -5,4 +5,6 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  */
diff --git a/docs/templates/html-header.txt b/docs/templates/html-header.txt
index 13c845a..36cc596 100644
--- a/docs/templates/html-header.txt
+++ b/docs/templates/html-header.txt
@@ -5,4 +5,6 @@
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this
     file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+    SPDX-License-Identifier: MPL-2.0
  -->
diff --git a/docs/templates/jet-header.txt b/docs/templates/jet-header.txt
index 0cbaaaa..5aa0a84 100644
--- a/docs/templates/jet-header.txt
+++ b/docs/templates/jet-header.txt
@@ -5,4 +5,6 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
  *}
diff --git a/docs/templates/yaml-header.txt b/docs/templates/yaml-header.txt
index 4589ca4..fc2612a 100644
--- a/docs/templates/yaml-header.txt
+++ b/docs/templates/yaml-header.txt
@@ -6,3 +6,5 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 #
+# SPDX-Licenrse-Identifier: MPL-2.0
+#