diff --git a/ChangeLog b/ChangeLog
index e6688229b..0adef4fdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-21 Paolo Nenzi <p.nenzi@ieee.org>
+
+ *   src/frontend/subckt.c, src/spicelib/parser/inp2q.c, 
+     src/spicelib/parser/inpdomod.c: Added fifth node on bipolar devices
+     (Dietmar Warning) to support newer (adms) models. Updated number of
+     nodes for subcircuits. 
+
 2006-02-19 Paolo Nenzi <p.nenzi@ieee.org>
 
  *   tests/bin/check.sh: added patch from Gary R. Van Sickle 
diff --git a/src/frontend/subckt.c b/src/frontend/subckt.c
index 848c00315..a5a88772a 100644
--- a/src/frontend/subckt.c
+++ b/src/frontend/subckt.c
@@ -1887,7 +1887,7 @@ inp_numnodes(char c)
         case 'm': return (7); /* This means that 7 is the maximun number of nodes */
         case 'o': return (4);
         case 'p': return (0);
-        case 'q': return (4);
+        case 'q': return (5);
         case 'r': return (2);
         case 's': return (4);
         case 't': return (4);
diff --git a/src/spicelib/parser/inp2q.c b/src/spicelib/parser/inp2q.c
index 6317717f2..c7f54e92e 100644
--- a/src/spicelib/parser/inp2q.c
+++ b/src/spicelib/parser/inp2q.c
@@ -26,11 +26,14 @@ void INP2Q(void *ckt, INPtables * tab, card * current, void *gnode)
     char *nname2;		/* the second node's name */
     char *nname3;		/* the third node's name */
     char *nname4;		/* the fourth node's name */
+    char *nname5;		/* the fifth node's name */
     void *node1;		/* the first node's node pointer */
     void *node2;		/* the second node's node pointer */
     void *node3;		/* the third node's node pointer */
     void *node4;		/* the fourth node's node pointer */
+    void *node5;		/* the fifth node's node pointer */
     int error;			/* error code temporary */
+    int nodeflag;		/* flag indicating 4 or 5 nodes */
     void *fast;			/* pointer to the actual instance */
     IFvalue ptemp;		/* a value structure to package resistance into */
     int waslead;		/* flag to indicate that funny unlabeled number was found */
@@ -45,6 +48,11 @@ void INP2Q(void *ckt, INPtables * tab, card * current, void *gnode)
 	LITERR("Device type BJT not supported by this binary\n");
 	return;
     }
+#ifdef TRACE
+    printf("INP2Q: Parsing '%s'\n",current->line);
+#endif
+
+    nodeflag = 0;		/*  initially specify a 4 terminal device  */
     line = current->line;
     INPgetTok(&line, &name, 1);
     INPinsert(&name, tab);
@@ -55,33 +63,66 @@ void INP2Q(void *ckt, INPtables * tab, card * current, void *gnode)
     INPgetNetTok(&line, &nname3, 1);
     INPtermInsert(ckt, &nname3, tab, &node3);
     INPgetTok(&line, &model, 1);
+
+    /*  See if 4th token after device specification is a model name  */
     if (INPlookMod(model)) {
-	/* do nothing for now */
+	/* 3-terminal device - substrate to ground */
 	node4 = gnode;
-	/* no action required */
+        INPinsert(&model, tab);
     } else {
 	nname4 = model;
 	INPtermInsert(ckt, &nname4, tab, &node4);
 	INPgetTok(&line, &model, 1);
+        /*  See if 5th token after device specification is a model name  */
+#ifdef TRACE
+        printf("INP2Q: checking for 4 node device\n");
+#endif
+        if (INPlookMod(model)) {
+	   /* 4-terminal device - special case with tnodeout flag not handled */
+           INPinsert(&model, tab);
+#ifdef ADMS
+        } else {
+	   /* 5-terminal device */
+#ifdef TRACE
+           printf("INP2Q: checking for 5 node device\n");
+#endif
+           nodeflag = 1;		/*  now specify a 5 node device  */
+           nname5 = model;
+           INPtermInsert(ckt, &nname5, tab, &node5);
+           INPgetTok(&line, &model, 1);
+           INPinsert(&model, tab);
+#endif
+        }
     }
-    INPinsert(&model, tab);
+
     current->error = INPgetMod(ckt, model, &thismodel, tab);
+#ifdef TRACE
+    printf("INP2Q: Looking up model\n");
+#endif
     if (thismodel != NULL) {
 	if((thismodel->INPmodType != INPtypelook("BJT"))
            && (thismodel->INPmodType != INPtypelook("BJT2"))
            && (thismodel->INPmodType != INPtypelook("VBIC"))
-#ifdef ADMS
-           && (thismodel->INPmodType != INPtypelook("hicum0"))
-           && (thismodel->INPmodType != INPtypelook("mextram"))
-#endif
 #ifdef CIDER
            && (thismodel->INPmodType != INPtypelook("NBJT"))
            && (thismodel->INPmodType != INPtypelook("NBJT2"))
 #endif
-         ) {
+#ifdef ADMS
+           && (thismodel->INPmodType != INPtypelook("hicum0"))
+           && (thismodel->INPmodType != INPtypelook("hicum2"))
+           && (thismodel->INPmodType != INPtypelook("mextram"))
+#endif
+          ) {
             LITERR("incorrect model type")
             return;
         }
+#ifdef ADMS
+	if (nodeflag && (thismodel->INPmodType != INPtypelook("hicum2")))
+        {
+            LITERR("Too much nodes for this model type")
+            return;
+        }
+#endif
         type = (thismodel->INPmodType);
         mdfast = (thismodel->INPmodfast);    
     } else {
@@ -96,7 +137,7 @@ void INP2Q(void *ckt, INPtables * tab, card * current, void *gnode)
     }
     
 #ifdef TRACE
-    printf ("In INP2Q, just about to dive into newInstance\n");
+    printf ("INP2Q: Just about to dive into newInstance\n");
 #endif
     
     IFC(newInstance, (ckt, mdfast, &fast, name));
@@ -104,11 +145,16 @@ void INP2Q(void *ckt, INPtables * tab, card * current, void *gnode)
     IFC(bindNode, (ckt, fast, 2, node2));
     IFC(bindNode, (ckt, fast, 3, node3));
     IFC(bindNode, (ckt, fast, 4, node4));
+    if (nodeflag) {
+      IFC(bindNode, (ckt, fast, 5, node5));
+    } else {
+      ((GENinstance *) fast)->GENnode5 = -1;
+    }
     PARSECALL((&line, ckt, type, fast, &leadval, &waslead, tab));
     if (waslead) {
 #ifdef CIDER
     if( type == INPtypelook("NBJT2") ) {
-            LITERR(" error:  no unlabelled parameter permitted on NBJT2\n")
+            LITERR(" error:  no unlabeled parameter permitted on NBJT2\n")
  	} else {
 #endif
 	ptemp.rValue = leadval;
diff --git a/src/spicelib/parser/inpdomod.c b/src/spicelib/parser/inpdomod.c
index c0b9603ca..f3b0ecbff 100644
--- a/src/spicelib/parser/inpdomod.c
+++ b/src/spicelib/parser/inpdomod.c
@@ -28,7 +28,6 @@ char *INPdomodel(void *ckt, card * image, INPtables * tab)
     line = image->line;
     
 #ifdef TRACE
-    /* SDB debug statement */
     printf("In INPdomodel, examining line %s . . . \n", line); 
 #endif    
     
@@ -64,6 +63,7 @@ char *INPdomodel(void *ckt, card * image, INPtables * tab)
                             "Device type VBIC not available in this binary\n");
                 }
                 break;
+#ifdef ADMS
 		case 6:
 			 type = INPtypelook("mextram");
                 if(type < 0) {
@@ -78,9 +78,17 @@ char *INPdomodel(void *ckt, card * image, INPtables * tab)
                             "Device type HICUM0 not available in this binary\n");
                 }
                 break;
+		case 8:
+			 type = INPtypelook("hicum2");
+                if(type < 0) {
+                    err = INPmkTemp(
+                            "Device type HICUM2 not available in this binary\n");
+                }
+                break;
+#endif
 		default: /* placeholder; use level 4 for the next model */
 		err = INPmkTemp(
-		  "Only BJT levels 1-2, 4,7 are supported in this binary\n");
+		  "Only BJT levels 1-2, 4,6,7,8 are supported in this binary\n");
                 break;
 
 	}	
@@ -614,7 +622,6 @@ char *INPdomodel(void *ckt, card * image, INPtables * tab)
       /* gtri - modify - wbk - 10/23/90 - modify to look for code models */
 
 #ifdef TRACE
-      /* SDB debug statement */
       printf("In INPdomodel, found unknown model type, typename = %s . . .\n", typename); 
 #endif
 
@@ -625,7 +632,6 @@ char *INPdomodel(void *ckt, card * image, INPtables * tab)
 	sprintf(err,"Unknown model type %s - ignored\n",typename);
 
 #ifdef TRACE
-	/* SDB debug statement */
 	printf("In INPdomodel, ignoring unknown model typ typename = %s . . .\n", typename); 
 #endif
 
@@ -633,7 +639,6 @@ char *INPdomodel(void *ckt, card * image, INPtables * tab)
       else {
 
 #ifdef TRACE
-	/* SDB debug statement */
 	printf("In INPdomodel, adding unknown model typename = %s to model list. . .\n", typename); 
 #endif