diff --git a/src/newgrf_config.cpp b/src/newgrf_config.cpp
--- a/src/newgrf_config.cpp
+++ b/src/newgrf_config.cpp
@@ -456,12 +456,12 @@ char *FindUnknownGRFName(uint32 grfid, u
 
 
 /* Retrieve a NewGRF from the current config by its grfid */
-GRFConfig *GetGRFConfig(uint32 grfid)
+GRFConfig *GetGRFConfig(uint32 grfid, uint32 mask)
 {
 	GRFConfig *c;
 
 	for (c = _grfconfig; c != NULL; c = c->next) {
-		if (c->grfid == grfid) return c;
+		if ((c->grfid & mask) == (grfid & mask)) return c;
 	}
 
 	return NULL;