diff --git a/.mailfilter b/.mailfilter
new file mode 100644
index 00000000..d675c816
--- /dev/null
+++ b/.mailfilter
@@ -0,0 +1,3 @@
+# This is a list of `shasum` hashed email addresses which are filtered from CONTRIBUTORS.txt, typically for privacy.
+# Lines can be generated by running `echo -n 'My Name <my@email>' | shasum | head -c 40`.
+
diff --git a/.mailmap b/.mailmap
index 253eec62..0c66d6ae 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1 +1,2 @@
-Patrick Freed <freedpatrick@gmail.com> <patrick.freed@mongodb.com>
\ No newline at end of file
+Patrick Freed <freedpatrick@gmail.com> <patrick.freed@mongodb.com>
+Chris McGee <87777443+cmcgee1024@users.noreply.github.com> <christie_mcgee@apple.com>
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index f317c56f..1aabaa6b 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -1,9 +1,40 @@
 For the purpose of tracking copyright, this is the list of individuals and
 organizations who have contributed source code to swiftly.
+
 For employees of an organization/company where the copyright of work done
 by employees of that company is held by the company itself, only the company
 needs to be listed here.
+
 ## COPYRIGHT HOLDERS
+
 - Swift Server Work Group
+- Apple Inc. (all contributors with '@apple.com')
+
 ### Contributors
+
+- Adam Fowler <adamfowler71@gmail.com>
+- Alexander <45719053+KeoFoxy@users.noreply.github.com>
+- Chris McGee <87777443+cmcgee1024@users.noreply.github.com>
+- Danny Mösch <danny.moesch@icloud.com>
+- Danny Pang <danny901113@gmail.com>
+- Johannes Weiss <johannesweiss@apple.com>
+- Joseph Heck <heckj@mac.com>
+- Joseph Heck <j_heck@apple.com>
+- Kenta Kubo <601636+kkebo@users.noreply.github.com>
+- Kenta Kubo <601636+kkk669@users.noreply.github.com>
+- Mahdi Bahrami <github@mahdibm.com>
+- Mark O <72238042+MDO190000@users.noreply.github.com>
+- Max Desiatov <m_desiatov@apple.com>
+- Mishal Shah <shahmishal@users.noreply.github.com>
+- Paris <paris_pittman@apple.com>
 - Patrick Freed <freedpatrick@gmail.com>
+- Paul LeMarquand <plemarquand@gmail.com>
+- Rauhul Varma <rauhul.varma@gmail.com>
+- Yuta Saito <kateinoigakukun@gmail.com>
+- Yutaka <y.tajika529@gmail.com>
+- johnbute <john.bute@hotmail.com>
+- vsarunas <3808892+vsarunas@users.noreply.github.com>
+
+**Updating this list**
+
+Please do not edit this file manually. It is generated using `./Utilities/generate_contributors_list.sh`. If a name is misspelled or appearing multiple times: add an entry in `./.mailmap`
diff --git a/scripts/generate_contributors_list.sh b/scripts/generate_contributors_list.sh
index 37d4fa6d..814923fb 100755
--- a/scripts/generate_contributors_list.sh
+++ b/scripts/generate_contributors_list.sh
@@ -1,19 +1,50 @@
-#!/usr/bin/env bash
+#!/bin/bash
+##===----------------------------------------------------------------------===##
+##
+## This source file is part of the Swift open source project
+##
+## Copyright (c) 2025 Apple Inc. and the Swift project authors
+## Licensed under Apache License v2.0 with Runtime Library Exception
+##
+## See http://swift.org/LICENSE.txt for license information
+## See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+##
+##===----------------------------------------------------------------------===##
 
 set -eu
 here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-contributors=$( cd "$here"/.. && git shortlog -es | cut -f2 | sed 's/^/- /' )
+contributor_list=$( cd "$here"/.. && git shortlog -es | cut -f2 )
+filtered_hashes=$( cat "$here/../.mailfilter" | grep -E '^[a-z0-9]+$' | sort )
+
+NL=$'\n'
+
+contributors=''
+while IFS= read -r line; do
+	hashed="$(echo -n "$line" | shasum | head -c 40)"
+	found_hash=$(comm -12 <(echo "$hashed") <(echo "$filtered_hashes"))
+	if [ ! -z "$found_hash" ]; then
+		continue
+	fi
+	contributors="${contributors}- $line$NL"
+done <<< "$contributor_list"
 
 cat > "$here/../CONTRIBUTORS.txt" <<- EOF
 	For the purpose of tracking copyright, this is the list of individuals and
 	organizations who have contributed source code to swiftly.
+
 	For employees of an organization/company where the copyright of work done
 	by employees of that company is held by the company itself, only the company
 	needs to be listed here.
+
 	## COPYRIGHT HOLDERS
+
 	- Swift Server Work Group
+	- Apple Inc. (all contributors with '@apple.com')
+
 	### Contributors
+
 	$contributors
 	**Updating this list**
+
 	Please do not edit this file manually. It is generated using \`./scripts/generate_contributors_list.sh\`. If a name is misspelled or appearing multiple times: add an entry in \`./.mailmap\`
 EOF