diff --git a/libcpuid/recog_amd.c b/libcpuid/recog_amd.c
index d3de18e..af4e980 100644
--- a/libcpuid/recog_amd.c
+++ b/libcpuid/recog_amd.c
@@ -213,6 +213,15 @@ const struct match_entry_t cpudb_amd[] = {
 	{ 15,  2, -1, 16,   -1,   1,    -1, PHENOM                  ,     0, "Phenom"                        },
 	{ 15,  2, -1, 16,   -1,   3,    -1, PHENOM                  ,     0, "Phenom X3 (Toliman)"           },
 	{ 15,  2, -1, 16,   -1,   4,    -1, PHENOM                  ,     0, "Phenom X4 (Agena)"             },
+	{ 15,  2, -1, 16,   -1,   3,   512, PHENOM                  ,     0, "Phenom X3 (Toliman/256K)"      },
+	{ 15,  2, -1, 16,   -1,   3,   512, PHENOM                  ,     0, "Phenom X3 (Toliman/512K)"      },
+	{ 15,  2, -1, 16,   -1,   4,   128, PHENOM                  ,     0, "Phenom X4 (Agena/128K)"        },
+	{ 15,  2, -1, 16,   -1,   4,   256, PHENOM                  ,     0, "Phenom X4 (Agena/256K)"        },
+	{ 15,  2, -1, 16,   -1,   4,   512, PHENOM                  ,     0, "Phenom X4 (Agena/512K)"        },
+	/* these are a bit speculative: */
+	{ 15,  4, -1, 16,   -1,   3,    -1, PHENOM                  ,     0, "Phenom X3 (???)"               },
+	{ 15,  4, -1, 16,   -1,   4,    -1, PHENOM                  ,     0, "Phenom X4 (Deneb)"             },
+	{ 15,  4, -1, 16,   -1,   4,    -1, NO_CODE                 ,     0, "Phenom (Deneb-based)"          },
 };
 
 
diff --git a/libcpuid/recog_intel.c b/libcpuid/recog_intel.c
index b27b422..1898426 100644
--- a/libcpuid/recog_intel.c
+++ b/libcpuid/recog_intel.c
@@ -108,6 +108,7 @@ const struct match_entry_t cpudb_intel[] = {
 	{  6,  1, -1, -1, -1,   1,    -1, NO_CODE           ,     0, "Pentium Pro"             },
 	{  6,  3, -1, -1, -1,   1,    -1, NO_CODE           ,     0, "Pentium II (Klamath)"    },
 	{  6,  5, -1, -1, -1,   1,    -1, NO_CODE           ,     0, "Pentium II (Deschutes)"  },
+	{  6,  5, -1, -1, -1,   1,    -1, MOBILE_PENTIUM    ,     0, "Mobile Pentium II (Tonga)"},
 	{  6,  6, -1, -1, -1,   1,    -1, NO_CODE           ,     0, "Pentium II (Dixon)"      },
 	
 	{  6,  3, -1, -1, -1,   1,    -1, XEON              ,     0, "P-II Xeon"               },
diff --git a/tests/tests_stash.txt b/tests/tests_stash.txt
index 1c37b96..b96f85e 100644
--- a/tests/tests_stash.txt
+++ b/tests/tests_stash.txt
@@ -2042,7 +2042,7 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 64
 64
 64
-Phenom X4 (Agena)
+Phenom X4 (Agena/512K)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni monitor cx16 syscall popcnt mmxext 3dnow 3dnowext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs ts ttp tm_amd stc 100mhzsteps hwpstate constant_tsc
 --------------------------------------------------------------------------------
 basic_cpuid[0]=0000000a 756e6547 6c65746e 49656e69