diff --git a/binaries/data/mods/public/hwdetect/hwdetect.js b/binaries/data/mods/public/hwdetect/hwdetect.js
index 854a66d4c5..841c896c8e 100644
--- a/binaries/data/mods/public/hwdetect/hwdetect.js
+++ b/binaries/data/mods/public/hwdetect/hwdetect.js
@@ -66,6 +66,9 @@ var g_IntelMesaChipsets = [
 	"Intel(R) Sandybridge Desktop",
 	"Intel(R) Sandybridge Mobile",
 	"Intel(R) Sandybridge Server",
+	"Intel(R) Ivybridge Desktop",
+	"Intel(R) Ivybridge Mobile",
+	"Intel(R) Ivybridge Server",
 	"Unknown Intel Chipset",
 ];
 // Originally generated from Mesa with
@@ -235,6 +238,14 @@ function RunDetection(settings)
 		warnings.push("Some graphics features are disabled, due to bugs in old graphics drivers. Upgrading to a Gallium-based driver might help.");
 	}
 
+	// http://www.wildfiregames.com/forum/index.php?showtopic=15058
+	// GF FX has poor shader performance, so fall back to non-shader
+	if (GL_RENDERER.match(/^GeForce FX /))
+	{
+		override_renderpath = "fixed";
+		disable_fancywater = true;
+	}
+
 	return {
 		"dialog_warnings": dialog_warnings,
 		"warnings": warnings,