diff --git a/src/spicelib/parser/inp2m.c b/src/spicelib/parser/inp2m.c
index 65b5546f2..3c95da2c6 100644
--- a/src/spicelib/parser/inp2m.c
+++ b/src/spicelib/parser/inp2m.c
@@ -217,7 +217,7 @@ INP2M (void *ckt, INPtables * tab, card * current)
 #ifdef CIDER
           && thismodel->INPmodType != INPtypelook ("NUMOS")
 #endif
-#ifdef HAVE_EKV	  
+#ifdef HAVE_ADMS
 	  && thismodel->INPmodType != INPtypelook ("EKV")
 #endif	
           && thismodel->INPmodType != INPtypelook ("HiSIM1")
diff --git a/src/spicelib/parser/inp2q.c b/src/spicelib/parser/inp2q.c
index 38fb01e2a..30465e629 100644
--- a/src/spicelib/parser/inp2q.c
+++ b/src/spicelib/parser/inp2q.c
@@ -70,8 +70,10 @@ void INP2Q(void *ckt, INPtables * tab, card * current, void *gnode)
 	if((thismodel->INPmodType != INPtypelook("BJT"))
            && (thismodel->INPmodType != INPtypelook("BJT2"))
            && (thismodel->INPmodType != INPtypelook("VBIC"))
+#ifdef HAVE_ADMS
            && (thismodel->INPmodType != INPtypelook("hicum0"))
            && (thismodel->INPmodType != INPtypelook("mextram"))
+#endif
 #ifdef CIDER
            && (thismodel->INPmodType != INPtypelook("NBJT"))
            && (thismodel->INPmodType != INPtypelook("NBJT2"))
diff --git a/src/spicelib/parser/inpdomod.c b/src/spicelib/parser/inpdomod.c
index e734b5102..c0b9603ca 100644
--- a/src/spicelib/parser/inpdomod.c
+++ b/src/spicelib/parser/inpdomod.c
@@ -308,7 +308,7 @@ char *INPdomodel(void *ckt, card * image, INPtables * tab)
 		if (type < 0) {
 		err =
 		    INPmkTemp
-		    ("Placeholder for EKV model: look at http://legwww.epfl.ch for info on EKV\n");
+		    ("Device type EKV not available in this binary\n");
 	    }
 	    break;    
 	case 49: