diff --git a/core/java/src/freenet/support/CPUInformation/AMDCPUInfo.java b/core/java/src/freenet/support/CPUInformation/AMDCPUInfo.java
index 5e730bbc3e..a749e97a14 100644
--- a/core/java/src/freenet/support/CPUInformation/AMDCPUInfo.java
+++ b/core/java/src/freenet/support/CPUInformation/AMDCPUInfo.java
@@ -27,7 +27,10 @@ public interface AMDCPUInfo extends CPUInfo {
      * @return true if the CPU present in the machine is at least an 'k6-3' CPU
      */
     public boolean IsK6_3_Compatible();
-
+    /**
+     * @return true if the CPU present in the machine is at least an 'geode' CPU
+     */
+    boolean IsGeodeCompatible();
     /**
      * @return true if the CPU present in the machine is at least an 'k7' CPU (Atlhon, Duron etc. and better)
      */
diff --git a/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java b/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java
index 90c6abc9de..bfbb3e9b62 100644
--- a/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java
+++ b/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java
@@ -5,6 +5,7 @@ class AMDInfoImpl extends CPUIDCPUInfo implements AMDCPUInfo
     protected static boolean isK6Compatible = false;
     protected static boolean isK6_2_Compatible = false;
     protected static boolean isK6_3_Compatible = false;
+    protected static boolean isGeodeCompatible = false;
     protected static boolean isAthlonCompatible = false;
     protected static boolean isAthlon64Compatible = false;
     protected static boolean isBobcatCompatible = false;
@@ -18,6 +19,8 @@ class AMDInfoImpl extends CPUIDCPUInfo implements AMDCPUInfo
     public boolean IsK6_2_Compatible(){ return isK6_2_Compatible; }
     @Override
     public boolean IsK6_3_Compatible(){ return isK6_3_Compatible; }
+    @Override 
+    public boolean IsGeodeCompatible(){ return isGeodeCompatible; }
     @Override
     public boolean IsAthlonCompatible(){ return isAthlonCompatible; }
     @Override
@@ -82,6 +85,16 @@ class AMDInfoImpl extends CPUIDCPUInfo implements AMDCPUInfo
                 case 3:
                     modelString = "K5";
                     break;
+                case 4:
+                	isK6Compatible = false;
+                	isGeodeCompatible = true;
+                	modelString = "Geode GX1/GXLV/GXm";
+                	break;
+                case 5:
+                	isK6Compatible = false;
+                	isGeodeCompatible = true;
+                	modelString = "Geode GX2/LX";
+                	break;
                 case 6:
                     modelString = "K6";
                     break;