diff --git a/sys/arch/i386/isa/joy_isapnp.c b/sys/arch/i386/isa/joy_isapnp.c
index 80edf0072d24..473abf62c8ab 100644
--- a/sys/arch/i386/isa/joy_isapnp.c
+++ b/sys/arch/i386/isa/joy_isapnp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: joy_isapnp.c,v 1.9 1997/11/18 11:31:07 augustss Exp $	*/
+/*	$NetBSD: joy_isapnp.c,v 1.10 1997/11/20 06:23:52 mikel Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -63,10 +63,11 @@ joy_isapnp_match(parent, match, aux)
 {
 	struct isapnp_attach_args *ipa = aux;
 
-	if (strcmp(ipa->ipa_devcompat, "PNPB02F") &&
- 	    strcmp(ipa->ipa_devlogic, "CTL7002") &&
-	    strcmp(ipa->ipa_devlogic, "ESS0001") &&
-	    strcmp(ipa->ipa_devlogic, "OPT0001"))
+	if (strcmp(ipa->ipa_devcompat, "PNPB02F") && /* generic */
+ 	    strcmp(ipa->ipa_devlogic, "CTL7002") && /* Creative Vibra16CL */
+	    strcmp(ipa->ipa_devlogic, "ESS0001") && /* ESS1868 */
+	    strcmp(ipa->ipa_devlogic, "OPT0001") && /* OPTi Audio 16 */
+	    strcmp(ipa->ipa_devlogic, "PNPB02F")) /* XXX broken GUS PnP */
 		return (0);
 
 	return 1;