diff --git a/vidix/savage_vid.c b/vidix/savage_vid.c
index d352614df0..633177df7f 100644
--- a/vidix/savage_vid.c
+++ b/vidix/savage_vid.c
@@ -296,14 +296,35 @@ unsigned int GetBlendForFourCC( int id )
  * @brief list of card IDs compliant with the Unichrome driver .
  */
 static struct savage_cards savage_card_ids[] = {
-	/*[ProSavage PN133] AGP4X VGA Controller (Twister)*/
-	{ PCI_CHIP_S3TWISTER_P, 	       		S3_PROSAVAGE },
-	/*[ProSavage KN133] AGP4X VGA Controller (TwisterK)*/
-	{ PCI_CHIP_S3TWISTER_K, 	       		S3_PROSAVAGE },
-	/*ProSavage DDR*/
-	{ PCI_CHIP_PROSAVAGE_DDR	, 		       		S3_PROSAVAGE },
-	/*[ProSavageDDR P4M266 K] */
-	{ PCI_CHIP_PROSAVAGE_DDRK	, 			S3_PROSAVAGE },
+        /* Savage3D */
+	{ DEVICE_S3_INC_86C794_SAVAGE_3D, S3_SAVAGE3D },
+	{ DEVICE_S3_INC_86C390_SAVAGE_3D_MV, S3_SAVAGE3D },
+	/* Savage4 */
+	{ DEVICE_S3_INC_SAVAGE_4, S3_SAVAGE4 },
+	{ DEVICE_S3_INC_SAVAGE_42, S3_SAVAGE4 },
+	/* SavageMX */
+	{ DEVICE_S3_INC_86C270_294_SAVAGE_MX_MV, S3_SAVAGE_MX },
+	{ DEVICE_S3_INC_82C270_294_SAVAGE_MX, S3_SAVAGE_MX },
+	{ DEVICE_S3_INC_86C270_294_SAVAGE_IX_MV, S3_SAVAGE_MX },
+	/* SuperSavage */
+	{ DEVICE_S3_INC_SUPERSAVAGE_MX_128, S3_SUPERSAVAGE },
+	{ DEVICE_S3_INC_SUPERSAVAGE_MX_64, S3_SUPERSAVAGE },
+	{ DEVICE_S3_INC_SUPERSAVAGE_MX_64C, S3_SUPERSAVAGE },
+	{ DEVICE_S3_INC_SUPERSAVAGE_IX_128_SDR, S3_SUPERSAVAGE },
+	{ DEVICE_S3_INC_SUPERSAVAGE_IX_128_DDR, S3_SUPERSAVAGE },
+	{ DEVICE_S3_INC_SUPERSAVAGE_IX_64_SDR, S3_SUPERSAVAGE },
+	{ DEVICE_S3_INC_SUPERSAVAGE_IX_64_DDR, S3_SUPERSAVAGE },
+	{ DEVICE_S3_INC_SUPERSAVAGE_IX_C_SDR, S3_SUPERSAVAGE },
+	{ DEVICE_S3_INC_SUPERSAVAGE_IX_C_DDR, S3_SUPERSAVAGE },
+	/* ProSavage */
+	{ DEVICE_S3_INC_PROSAVAGE_PM133, S3_PROSAVAGE },
+	{ DEVICE_S3_INC_PROSAVAGE_KM133, S3_PROSAVAGE },
+	{ DEVICE_S3_INC_86C380_PROSAVAGEDDR_K4M266, S3_PROSAVAGE },
+	{ DEVICE_S3_INC_VT8636A_PROSAVAGE_KN133, S3_PROSAVAGE },
+	{ DEVICE_S3_INC_VT8751_PROSAVAGEDDR_P4M266, S3_PROSAVAGE },
+	{ DEVICE_S3_INC_VT8375_PROSAVAGE8_KM266_KL266, S3_PROSAVAGE },
+	/* Savage2000 */
+	{ DEVICE_S3_INC_86C410_SAVAGE_2000, S3_SAVAGE2000 },
 };
 
 static void SavageSetColorOld(void)