diff --git a/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java b/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java
index da71628ee..d5c7f5886 100644
--- a/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java
+++ b/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java
@@ -477,6 +477,23 @@ class AMDInfoImpl extends CPUIDCPUInfo implements AMDCPUInfo
                modelString = "Ryzen model " + model;
           }
           break;
+
+        // http://lkml.iu.edu/hypermail/linux/kernel/1806.1/00730.html
+        // untested
+          case 24: {
+            isK6Compatible = true;
+            isK6_2_Compatible = true;
+            isK6_3_Compatible = true;
+            isAthlonCompatible = true;
+            isAthlon64Compatible = true;
+            // Pending testing of the bulldozer jbigi
+            //isPiledriverCompatible = true;
+            //isSteamrollerCompatible = true;
+            //isExcavatorCompatible = true;
+            //isBulldozerCompatible = true;
+            modelString = "Hygon Dhyana model " + model;
+          }
+          break;
         }
         return modelString;
     }
diff --git a/core/java/src/freenet/support/CPUInformation/CPUID.java b/core/java/src/freenet/support/CPUInformation/CPUID.java
index ca8c092cd..82df6138f 100644
--- a/core/java/src/freenet/support/CPUInformation/CPUID.java
+++ b/core/java/src/freenet/support/CPUInformation/CPUID.java
@@ -310,7 +310,8 @@ public class CPUID {
             return new VIAInfoImpl();
         if(!isX86)
             throw new UnknownCPUException("Failed to read CPU information from the system. The CPUID instruction exists on x86 CPUs only.");
-        if(id.equals("AuthenticAMD"))
+        // http://lkml.iu.edu/hypermail/linux/kernel/1806.1/00730.html
+        if(id.equals("AuthenticAMD") || id.equals("HygonGenuine"))
             return new AMDInfoImpl();
         if(id.equals("GenuineIntel"))
             return new IntelInfoImpl();