diff --git a/src/spicelib/devices/hisim/Makefile.am b/src/spicelib/devices/hisim/Makefile.am
index 5a72e05b4..b3415b728 100644
--- a/src/spicelib/devices/hisim/Makefile.am
+++ b/src/spicelib/devices/hisim/Makefile.am
@@ -1,11 +1,28 @@
 ## Process this file with automake to produce Makefile.in
 
-pkglib_LTLIBRARIES = libhsm1.la
+noinst_LIBRARIES = libhsm1.a
 
-libhsm1_la_SOURCES = hsm1.c hsm1acld.c hsm1ask.c hsm1cvtest.c hsm1del.c hsm1dest.c \
-		    hsm1eval102.c hsm1eval112.c hsm1eval120.c hsm1getic.c hsm1init.c hsm1ld.c \
-		    hsm1mask.c hsm1mdel.c hsm1mpar.c hsm1noi.c hsm1par.c hsm1pzld.c \
-		    hsm1set.c hsm1temp.c hsm1trunc.c
+libhsm1_la_SOURCES = 	hsm1.c		\ 
+			hsm1acld.c	\ 
+			hsm1ask.c 	\
+			hsm1cvtest.c 	\
+			hsm1del.c 	\
+			hsm1dest.c 	\
+			hsm1eval102.c	\
+			hsm1eval112.c 	\
+			hsm1eval120.c 	\
+			hsm1getic.c 	\
+			hsm1init.c 	\
+			hsm1ld.c 	\
+			hsm1mask.c 	\
+			hsm1mdel.c 	\
+			hsm1mpar.c 	\
+			hsm1noi.c 	\
+			hsm1par.c 	\
+			hsm1pzld.c 	\
+			hsm1set.c 	\
+			hsm1temp.c 	\
+			hsm1trunc.c
 
 
 INCLUDES = -I$(top_srcdir)/src/include
diff --git a/src/spicelib/devices/hisim/hsm1cvtest.c b/src/spicelib/devices/hisim/hsm1cvtest.c
index da2ae48d0..7949f1609 100644
--- a/src/spicelib/devices/hisim/hsm1cvtest.c
+++ b/src/spicelib/devices/hisim/hsm1cvtest.c
@@ -77,7 +77,7 @@ HSM1convTest(GENmodel *inModel, register CKTcircuit *ckt)
 /* gtri - begin - wbk - report conv prob */
                 if(ckt->enh->conv_debug.report_conv_probs) {
                     ENHreport_conv_prob(ENH_ANALOG_INSTANCE,
-                                        (char *) here->MOS1name,
+                                        (char *) here->HSM11name,
                                         "");
                 }
 /* gtri - end - wbk - report conv prob */	
diff --git a/src/spicelib/devices/hisim/hsm1noi.c b/src/spicelib/devices/hisim/hsm1noi.c
index ba87356ef..c1316b20d 100644
--- a/src/spicelib/devices/hisim/hsm1noi.c
+++ b/src/spicelib/devices/hisim/hsm1noi.c
@@ -150,7 +150,7 @@ HSM1noise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt,
 	    I = here->HSM1_gm + here->HSM1_gds + here->HSM1_gmbs;
 	    I *= (I < 0.0) ? -1.0 : 1.0;
 	    I *= 2.0/3.0;
-	    I *=  here->HSM1_m; /* PN */	    
+	    I *=  here->HSM1_m; /* PN */    
 	    NevalSrc(&noizDens[HSM1IDNOIZ], &lnNdens[HSM1IDNOIZ], 
 		     ckt, THERMNOISE, 
 		     here->HSM1dNodePrime, here->HSM1sNodePrime, I);
@@ -161,7 +161,7 @@ HSM1noise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt,
 	      / (here->HSM1_weff * here->HSM1_leff);
 	    I *= (I < 0.0) ? -1.0 : 1.0;
 	    I *= here->HSM1_mu;
-	    I *=  here->HSM1_m; /* PN */	    
+	    I *=  here->HSM1_m; /* PN */  
 	    NevalSrc(&noizDens[HSM1IDNOIZ], &lnNdens[HSM1IDNOIZ], 
 		     ckt, THERMNOISE, 
 		     here->HSM1dNodePrime, here->HSM1sNodePrime, I);