diff --git a/tools/sort_lists.py b/tools/sort_lists.py
new file mode 100644
index 00000000000..9e920a6f090
--- /dev/null
+++ b/tools/sort_lists.py
@@ -0,0 +1,97 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+import csv
+import argparse
+import webbrowser
+from subprocess import check_output
+
+VERSION = "1.0"
+
+def find_files_by_name(directory, filenames):
+    matches = []
+    for root, _, files in os.walk(directory):
+        for filename in files:
+            if filename in filenames:
+                matches.append(os.path.join(root, filename))
+    return matches
+
+def get_modified_files_in_last_commit():
+    output = check_output(["git", "diff", "--name-only", "HEAD~1", "HEAD"]).decode().splitlines()
+    return output
+
+def sort_file_alphanum(file_path):
+    with open(file_path, 'r') as file:
+        lines = file.readlines()
+
+    header = "domain,"
+    if not lines or lines[0].strip() != header:
+        lines.insert(0, header + "\n")
+
+    lines = [line for line in lines if line.strip()]  # Remove empty lines
+    lines = sorted(lines[1:], key=lambda x: x.strip().split(',')[0])  # Sort FQDNs
+    lines.insert(0, header + "\n")
+
+    with open(file_path, 'w') as file:
+        file.writelines(lines)
+        file.write("\n")  # Ensure one last newline
+
+def sort_file_hierarchical(file_path):
+    with open(file_path, 'r') as file:
+        lines = file.readlines()
+
+    header = "domain,"
+    if not lines or lines[0].strip() != header:
+        lines.insert(0, header + "\n")
+
+    lines = [line for line in lines if line.strip()]  # Remove empty lines
+    lines = sorted(lines[1:], key=lambda x: (x.strip().split(',')[0], x.strip().split(',')[1]))  # Sort FQDNs and CIDR
+    lines.insert(0, header + "\n")
+
+    with open(file_path, 'w') as file:
+        file.writelines(lines)
+        file.write("\n")  # Ensure one last newline
+
+def handle_donate():
+    try:
+        webbrowser.get('tor').open('https://www.mypdns.org/donate')
+    except webbrowser.Error:
+        try:
+            webbrowser.get('firefox-esr').open('https://www.mypdns.org/donate')
+        except webbrowser.Error:
+            try:
+                webbrowser.get('firefox').open('https://www.mypdns.org/donate')
+            except webbrowser.Error:
+                webbrowser.open('https://www.mypdns.org/donate')
+
+def main():
+    parser = argparse.ArgumentParser(description="Sort and clean CSV files.")
+    parser.add_argument('-v', '--version', action='version', version=f"%(prog)s {VERSION}")
+    parser.add_argument('-f', '--force', action='store_true', help="Force run on all files, altered or not")
+    parser.add_argument('-d', '-s', '--donate', '--sponsor', action='store_true', help="Open the donate link in default browser")
+    args = parser.parse_args()
+
+    if args.donate:
+        handle_donate()
+        sys.exit(0)
+
+    alphanum_filenames = ["tld.csv", "wildcard.csv", "wildcard.rpz-nsdname.csv", "domains.rpz-nsdname.csv", "mobile.csv", "snuff.csv"]
+    hierarchical_filenames = ["domains.csv", "onions.csv", "rpz-ip.csv", "ip4.csv", "ip6.csv", "rpz-client-ip.csv", "rpz-drop.csv", "rpz-ip.csv", "hosts.csv"]
+
+    modified_files = get_modified_files_in_last_commit()
+    target_files_alphanum = find_files_by_name("source", alphanum_filenames)
+    target_files_hierarchical = find_files_by_name("source", hierarchical_filenames)
+
+    for file in target_files_alphanum:
+        if args.force or any(file.endswith(modified) for modified in modified_files):
+            sort_file_alphanum(file)
+
+    for file in target_files_hierarchical:
+        if args.force or any(file.endswith(modified) for modified in modified_files):
+            sort_file_hierarchical(file)
+
+    print("Please consider sponsoring My Privacy DNS at https://www.mypdns.org/donate")
+
+if __name__ == "__main__":
+    main()