diff --git a/app/models/names_manager/canonical_names.rb b/app/models/names_manager/canonical_names.rb
index 6229000b..17becf66 100644
--- a/app/models/names_manager/canonical_names.rb
+++ b/app/models/names_manager/canonical_names.rb
@@ -359,7 +359,7 @@ def self.map(canonical_name, *also_as)
     map 'David Easley',               "easleydp\100gmail.com"
     map 'David Felstead',             "david.felstead\100gmail.com", "dfelstead\100site5.com"
     map 'David François',             'David FRANCOIS', 'davout'
-    map 'David Heinemeier Hansson',   'DHH', 'David' # for David see 5d5f0bad6e934d9d4fad7d0fa4643d04c13709a9
+    map 'David Heinemeier Hansson',   'DHH', 'dhh', 'David' # for David see 5d5f0bad6e934d9d4fad7d0fa4643d04c13709a9
     map 'David Morton',               "mortonda\100dgrmm.net"
     map 'David N. Welton',            'davidw'
     map 'David Raynes',               'rayners'
diff --git a/test/credits/canonical_names_test.rb b/test/credits/canonical_names_test.rb
index 0eb3f88a..74d9ac81 100644
--- a/test/credits/canonical_names_test.rb
+++ b/test/credits/canonical_names_test.rb
@@ -5163,5 +5163,9 @@ class CanonicalNamesTest < ActiveSupport::TestCase
     test 'Harsh' do
       assert_contributor_names '5ff38f4', 'Harsh Deep'
     end
+
+    test 'dhh' do
+      assert_contributor_names 'dd6f3e1', 'David Heinemeier Hansson'
+    end
   end
 end