diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml
index 6db2af9f6..37316adac 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml
@@ -3,7 +3,11 @@
 <!--
   $Id$
   $Log$
-  Revision 1.4  2006-03-05 09:38:41  pnenzi
+  Revision 1.5  2007-04-24 08:59:09  r29173
+  added missing new lines (due to changes in adms225)
+  renamed pspva to psp102
+
+  Revision 1.4  2006/03/05 09:38:41  pnenzi
 
   Updated version to 2.2.0
 
@@ -83,6 +87,7 @@ int $(module)ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
   }
   return(-1);
 }
+
 </admst:template>
 
 <admst:for-each select="/module">
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEext.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEext.h.xml
index 6b8f6fc91..afb403f7b 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEext.h.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEext.h.xml
@@ -3,7 +3,11 @@
 <!--
   $Id$
   $Log$
-  Revision 1.4  2006-03-05 09:38:41  pnenzi
+  Revision 1.5  2007-04-24 08:59:09  r29173
+  added missing new lines (due to changes in adms225)
+  renamed pspva to psp102
+
+  Revision 1.4  2006/03/05 09:38:41  pnenzi
 
   Updated version to 2.2.0
 
@@ -74,6 +78,7 @@ extern int $(module)unsetup(GENmodel*,CKTcircuit*);
 extern void $(module)destroy(GENmodel**);
 
 #endif
+
 </admst:template>
 
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEinit.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEinit.h.xml
index e8185b9ae..c52f35958 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEinit.h.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEinit.h.xml
@@ -3,7 +3,11 @@
 <!--
   $Id$
   $Log$
-  Revision 1.4  2006-03-05 09:38:41  pnenzi
+  Revision 1.5  2007-04-24 08:59:09  r29173
+  added missing new lines (due to changes in adms225)
+  renamed pspva to psp102
+
+  Revision 1.4  2006/03/05 09:38:41  pnenzi
 
   Updated version to 2.2.0
 
@@ -59,6 +63,7 @@ extern int $(module)iSize;
 extern int $(module)mSize;
 
 #endif
+
 </admst:template>
 
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEitf.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEitf.h.xml
index baf88806d..8990c0e61 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEitf.h.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEitf.h.xml
@@ -3,7 +3,11 @@
 <!--
   $Id$
   $Log$
-  Revision 1.4  2006-03-05 09:38:41  pnenzi
+  Revision 1.5  2007-04-24 08:59:09  r29173
+  added missing new lines (due to changes in adms225)
+  renamed pspva to psp102
+
+  Revision 1.4  2006/03/05 09:38:41  pnenzi
 
   Updated version to 2.2.0
 
@@ -52,6 +56,7 @@
 extern SPICEdev *get_$(module)_info(void);
 
 #endif
+
 </admst:template>
 
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEmpar.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEmpar.c.xml
index 71420ee00..6a35767f9 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEmpar.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEmpar.c.xml
@@ -3,7 +3,11 @@
 <!--
   $Id$
   $Log$
-  Revision 1.4  2006-03-05 09:38:41  pnenzi
+  Revision 1.5  2007-04-24 08:59:09  r29173
+  added missing new lines (due to changes in adms225)
+  renamed pspva to psp102
+
+  Revision 1.4  2006/03/05 09:38:41  pnenzi
 
   Updated version to 2.2.0
 
@@ -85,6 +89,7 @@ int $(module)mParam(int param, IFvalue *value, GENmodel *inMod)
   }
   return(OK);
 }
+
 </admst:template>
 
 <admst:for-each select="/module">
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml
index d681f09d3..ec7967c84 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml
@@ -3,7 +3,11 @@
 <!--
   $Id$
   $Log$
-  Revision 1.4  2006-03-05 09:38:41  pnenzi
+  Revision 1.5  2007-04-24 08:59:09  r29173
+  added missing new lines (due to changes in adms225)
+  renamed pspva to psp102
+
+  Revision 1.4  2006/03/05 09:38:41  pnenzi
 
   Updated version to 2.2.0
 
@@ -83,6 +87,7 @@ int $(module)par(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
   }
   return(OK);
 }
+
 </admst:template>
 
 <admst:for-each select="/module">
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml
index da7bdfe7f..8fa0e2701 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml
@@ -3,7 +3,11 @@
 <!--
   $Id$
   $Log$
-  Revision 1.4  2006-03-05 09:38:41  pnenzi
+  Revision 1.5  2007-04-24 08:59:09  r29173
+  added missing new lines (due to changes in adms225)
+  renamed pspva to psp102
+
+  Revision 1.4  2006/03/05 09:38:41  pnenzi
 
   Updated version to 2.2.0
 
@@ -79,10 +83,12 @@ int $(module)temp(GENmodel *inModel, CKTcircuit *ckt)
   register $(module)instance *here;
   for ( ; model != NULL; model = model->$(module)nextModel )
   {
+
 <admst:apply-templates select="analog" match="analog:initial_model" required="yes"/>
     /* loop through all the instances of the model */
     for (here = model->$(module)instances; here != NULL ; here = here->$(module)nextInstance)
     {
+
 <admst:apply-templates select="analog" match="analog:initial_instance" required="yes"/>
     } /* End of MOSFET Instance */
   } /* End of Model Instance */
diff --git a/src/spicelib/devices/adms/admst/ngspiceVersion.xml b/src/spicelib/devices/adms/admst/ngspiceVersion.xml
index 40da4f525..9c522ac0c 100644
--- a/src/spicelib/devices/adms/admst/ngspiceVersion.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceVersion.xml
@@ -5,7 +5,11 @@
 -->
 <!--
   $Log$
-  Revision 1.12  2006-03-06 12:55:02  r29173
+  Revision 1.13  2007-04-24 08:59:09  r29173
+  added missing new lines (due to changes in adms225)
+  renamed pspva to psp102
+
+  Revision 1.12  2006/03/06 12:55:02  r29173
   added support to 'analog functions'
 
   Revision 1.11  2006/03/05 09:38:41  pnenzi
@@ -1794,7 +1798,7 @@
 </admst:template>
 
 <!-- variable:rhs -->
-<admst:template match="variable" mode="rhs">
+<admst:template match="variable">
   <admst:value-of select="name"/>
   <admst:if test="[parametertype='analogfunction']">
     <admst:value-to select="/simulator/tmp" value="%s"/>
@@ -1883,10 +1887,10 @@
           <admst:value-to select="value" value="mextram"/>
         </admst:new>
       </admst:when>
-      <admst:when test="[name='pspva']">
+      <admst:when test="[name='psp102']">
         <admst:new datatype="attribute" arguments="ngspicename">
           <admst:push into="../attribute" select="." onduplicate="abort"/>
-          <admst:value-to select="value" value="psp"/>
+          <admst:value-to select="value" value="psp102"/>
         </admst:new>
       </admst:when>
       <admst:otherwise>
@@ -1994,7 +1998,7 @@
           </admst:new>
         </admst:if>
       </admst:when>
-      <admst:when test="[name='pspva']">
+      <admst:when test="[name='psp102']">
         <admst:if test="[nilled(variable[name='nmos'])]">
           <admst:value-of select="analog"/>
           <admst:value-of select="."/>