diff --git a/core/java/src/freenet/support/CPUInformation/AMDCPUInfo.java b/core/java/src/freenet/support/CPUInformation/AMDCPUInfo.java
index 5cb6772739..4b4b0ec681 100644
--- a/core/java/src/freenet/support/CPUInformation/AMDCPUInfo.java
+++ b/core/java/src/freenet/support/CPUInformation/AMDCPUInfo.java
@@ -41,6 +41,7 @@ public interface AMDCPUInfo extends CPUInfo {
     public boolean IsAthlon64Compatible();
     /** 
      * @return true if the CPU present in the machine is at least an 'k10' CPU
+     * @since 0.9.26
      */
     public boolean IsK10Compatible();
     /**
@@ -49,6 +50,7 @@ public interface AMDCPUInfo extends CPUInfo {
 	public boolean IsBobcatCompatible();
     /**
      * @return true if the CPU present in the machine is at least an 'jaguar' CPU
+     * @since 0.9.26
      */
 	public boolean IsJaguarCompatible();
     /**
@@ -57,14 +59,17 @@ public interface AMDCPUInfo extends CPUInfo {
 	public boolean IsBulldozerCompatible();
     /**
      * @return true if the CPU present in the machine is at least a 'piledriver' CPU
+     * @since 0.9.26
      */
 	public boolean IsPiledriverCompatible();
     /**
      * @return true if the CPU present in the machine is at least a 'steamroller' CPU
+     * @since 0.9.26
      */
 	public boolean IsSteamrollerCompatible();
     /**
      * @return true if the CPU present in the machine is at least a 'excavator' CPU
+     * @since 0.9.26
      */
 	public boolean IsExcavatorCompatible();
 
diff --git a/core/java/src/freenet/support/CPUInformation/CPUID.java b/core/java/src/freenet/support/CPUInformation/CPUID.java
index d23f4f23bb..5bd79d0ae7 100644
--- a/core/java/src/freenet/support/CPUInformation/CPUID.java
+++ b/core/java/src/freenet/support/CPUInformation/CPUID.java
@@ -376,27 +376,33 @@ public class CPUID {
         System.out.println("CPU has ABM:    " + c.hasABM());
         if(c instanceof IntelCPUInfo){
             System.out.println("\n **Intel-info**");
-            System.out.println("Is PII-compatible: "+((IntelCPUInfo)c).IsPentium2Compatible());
-            System.out.println("Is PIII-compatible: "+((IntelCPUInfo)c).IsPentium3Compatible());
-            System.out.println("Is PIV-compatible: "+((IntelCPUInfo)c).IsPentium4Compatible());
-            System.out.println("Is Atom-compatible: "+((IntelCPUInfo)c).IsAtomCompatible());
+            System.out.println("Is PII-compatible:       "+((IntelCPUInfo)c).IsPentium2Compatible());
+            System.out.println("Is PIII-compatible:      "+((IntelCPUInfo)c).IsPentium3Compatible());
+            System.out.println("Is PIV-compatible:       "+((IntelCPUInfo)c).IsPentium4Compatible());
+            System.out.println("Is Atom-compatible:      "+((IntelCPUInfo)c).IsAtomCompatible());
             System.out.println("Is Pentium M compatible: "+((IntelCPUInfo)c).IsPentiumMCompatible());
-            System.out.println("Is Core2-compatible: "+((IntelCPUInfo)c).IsCore2Compatible());
-            System.out.println("Is Corei-compatible: "+((IntelCPUInfo)c).IsCoreiCompatible());
-            System.out.println("Is Sandy-compatible: "+((IntelCPUInfo)c).IsSandyCompatible());
-            System.out.println("Is Ivy-compatible: "+((IntelCPUInfo)c).IsIvyCompatible());
-            System.out.println("Is Haswell-compatible: "+((IntelCPUInfo)c).IsHaswellCompatible());
+            System.out.println("Is Core2-compatible:     "+((IntelCPUInfo)c).IsCore2Compatible());
+            System.out.println("Is Corei-compatible:     "+((IntelCPUInfo)c).IsCoreiCompatible());
+            System.out.println("Is Sandy-compatible:     "+((IntelCPUInfo)c).IsSandyCompatible());
+            System.out.println("Is Ivy-compatible:       "+((IntelCPUInfo)c).IsIvyCompatible());
+            System.out.println("Is Haswell-compatible:   "+((IntelCPUInfo)c).IsHaswellCompatible());
             System.out.println("Is Broadwell-compatible: "+((IntelCPUInfo)c).IsBroadwellCompatible());
         }
         if(c instanceof AMDCPUInfo){
             System.out.println("\n **AMD-info**");
-            System.out.println("Is K6-compatible: "+((AMDCPUInfo)c).IsK6Compatible());
-            System.out.println("Is K6_2-compatible: "+((AMDCPUInfo)c).IsK6_2_Compatible());
-            System.out.println("Is K6_3-compatible: "+((AMDCPUInfo)c).IsK6_3_Compatible());
-            System.out.println("Is Geode-compatible: "+((AMDCPUInfo)c).IsGeodeCompatible());
-            System.out.println("Is Athlon-compatible: "+((AMDCPUInfo)c).IsAthlonCompatible());
-            System.out.println("Is Athlon64-compatible: "+((AMDCPUInfo)c).IsAthlon64Compatible());
-            System.out.println("Is Bobcat-compatible: "+((AMDCPUInfo)c).IsBobcatCompatible());
+            System.out.println("Is K6-compatible:          "+((AMDCPUInfo)c).IsK6Compatible());
+            System.out.println("Is K6_2-compatible:        "+((AMDCPUInfo)c).IsK6_2_Compatible());
+            System.out.println("Is K6_3-compatible:        "+((AMDCPUInfo)c).IsK6_3_Compatible());
+            System.out.println("Is Geode-compatible:       "+((AMDCPUInfo)c).IsGeodeCompatible());
+            System.out.println("Is Athlon-compatible:      "+((AMDCPUInfo)c).IsAthlonCompatible());
+            System.out.println("Is Athlon64-compatible:    "+((AMDCPUInfo)c).IsAthlon64Compatible());
+            System.out.println("Is Bobcat-compatible:      "+((AMDCPUInfo)c).IsBobcatCompatible());
+            System.out.println("Is K10-compatible:         "+((AMDCPUInfo)c).IsK10Compatible());
+            System.out.println("Is Jaguar-compatible:      "+((AMDCPUInfo)c).IsJaguarCompatible());
+            System.out.println("Is Bulldozer-compatible:   "+((AMDCPUInfo)c).IsBulldozerCompatible());
+            System.out.println("Is Piledriver-compatible:  "+((AMDCPUInfo)c).IsPiledriverCompatible());
+            System.out.println("Is Steamroller-compatible: "+((AMDCPUInfo)c).IsSteamrollerCompatible());
+            System.out.println("Is Excavator-compatible:   "+((AMDCPUInfo)c).IsExcavatorCompatible());
         }
     }