diff --git a/configure.ac b/configure.ac
index cc3fbc1ec..e431178d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1082,12 +1082,35 @@ if test "$enable_klu" = "yes"; then
 fi
 AM_CONDITIONAL([KLU_WANTED], [test "$enable_klu" = "yes"])
 
+# --enable-superlu: Use SuperLU linear systems solver
+AC_ARG_ENABLE(superlu,
+    AS_HELP_STRING([--enable-superlu],[Use SuperLU linear systems solver]))
+
+# Add SuperLU solver to ngspice
+if test "$enable_superlu" = "yes"; then
+    AC_DEFINE(SuperLU,[],[Define if we want SuperLU linear systems solver])
+    AC_MSG_RESULT(WARNING: SuperLU solver enabled - at the moment it only works with transient analyses)
+fi
+AM_CONDITIONAL([SuperLU_WANTED], [test "$enable_superlu" = "yes"])
+
+#REMOVE THIS TEST IN THE FUTURE WHEN BOTH KLU AND SuperLU ARE SUPPORTED IN THE MEAN TIME
+if test "$enable_klu" = "yes" && test "$enable_superlu" = "yes" ; then
+    AC_MSG_ERROR(ERROR: KLU and SuperLU can't be enabled together at the moment)
+fi
+
+if test "$enable_pss" = "yes"; then
+    AC_MSG_RESULT(WARNING: PSS analysis enabled)
+fi
+
 # Output Files
 # ------------
 
 AM_COND_IF([KLU_WANTED],
 	[AC_CONFIG_FILES([src/maths/KLU/Makefile])])
 
+AM_COND_IF([SuperLU_WANTED],
+	[AC_CONFIG_FILES([src/maths/SuperLU/Makefile])])
+
 AC_CONFIG_FILES([Makefile
                  man/Makefile
                  man/man1/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 7d78cb72d..bbc22b905 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -174,6 +174,10 @@ if KLU_WANTED
 ngspice_LDADD += maths/KLU/libKLU.la
 endif
 
+if SuperLU_WANTED
+ngspice_LDADD += maths/SuperLU/libSuperLU.la
+endif
+
 ngspice_LDADD += \
 	maths/sparse/libsparse.la \
 	misc/libmisc.la
@@ -280,6 +284,10 @@ if KLU_WANTED
 ngmultidec_LDADD += maths/KLU/libKLU.la
 endif
 
+if SuperLU_WANTED
+ngmultidec_LDADD += maths/SuperLU/libSuperLU.la
+endif
+
 ## ngmakeidx:
 
 ngmakeidx_SOURCES = makeidx.c
@@ -415,6 +423,10 @@ if KLU_WANTED
 libspice_la_LIBADD += maths/KLU/libKLU.la
 endif
 
+if SuperLU_WANTED
+libspice_la_LIBADD += maths/SuperLU/libSuperLU.la
+endif
+
 libspice_la_LIBADD += \
 	maths/deriv/libderiv.la \
 	maths/cmaths/libcmaths.la \
diff --git a/src/include/ngspice/devdefs.h b/src/include/ngspice/devdefs.h
index ba19b12f2..3d0b8089e 100644
--- a/src/include/ngspice/devdefs.h
+++ b/src/include/ngspice/devdefs.h
@@ -101,7 +101,7 @@ typedef struct SPICEdev {
     int *DEVinstSize;    /* size of an instance */
     int *DEVmodSize;     /* size of a model */
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
     int (*DEVbindCSC)(GENmodel*, CKTcircuit*);
     int (*DEVbindCSCComplex)(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/include/ngspice/smpdefs.h b/src/include/ngspice/smpdefs.h
index c8b4c5b74..59c327d43 100644
--- a/src/include/ngspice/smpdefs.h
+++ b/src/include/ngspice/smpdefs.h
@@ -18,14 +18,16 @@ Modified: 2000  AlansFixes
 #include <math.h>
 #include "ngspice/complex.h"
 
-#ifdef KLU
+#if defined(KLU)
 #include "ngspice/klu.h"
+#elif defined(SuperLU)
+#include "ngspice/slu_ddefs.h"
 #endif
 
 struct SMPmatrix {
     MatrixFrame *SPmatrix ;               /* pointer to sparse matrix */
 
-#ifdef KLU
+#if defined(KLU)
     klu_common *CKTkluCommon ;            /* KLU common object */
     klu_symbolic *CKTkluSymbolic ;        /* KLU symbolic object */
     klu_numeric *CKTkluNumeric ;          /* KLU numeric object */
@@ -43,6 +45,31 @@ struct SMPmatrix {
     int CKTkluMODE ;                      /* KLU MODE parameter to enable KLU or not from the heuristic */
     #define CKTkluON  1                   /* KLU MODE ON  definition */
     #define CKTkluOFF 0                   /* KLU MODE OFF definition */
+#elif defined(SuperLU)
+    int *CKTsuperluAp ;
+    int *CKTsuperluAi ;
+    double *CKTsuperluAx ;
+    SuperMatrix CKTsuperluA ;
+    SuperMatrix CKTsuperluL ;
+    SuperMatrix CKTsuperluU ;
+    SuperMatrix CKTsuperluI ;
+    SuperMatrix CKTsuperluAC ;
+    int *CKTsuperluPerm_r ;
+    int *CKTsuperluPerm_c ;
+    int CKTsuperluInfo ;
+    int *CKTsuperluEtree ;
+    superlu_options_t CKTsuperluOptions ;
+    SuperLUStat_t CKTsuperluStat ;
+    double *CKTsuperluIntermediate ;
+    double **CKTbind_Sparse ;
+    double **CKTbind_CSC ;
+    double **CKTbind_CSC_Complex ;
+    double **CKTdiag_CSC ;
+    int CKTsuperluN ;
+    int CKTsuperlunz ;
+    int CKTsuperluMODE ;
+    #define CKTsuperluON 1		   /* SuperLU MODE ON definition */
+    #define CKTsuperluOFF 0		   /* SuperLU MODE OFF definition */
 #endif
 
 };
@@ -51,7 +78,7 @@ struct SMPmatrix {
 typedef struct SMPmatrix SMPmatrix ;
 
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 void SMPmatrix_CSC ( SMPmatrix * ) ;
 void SMPnnz ( SMPmatrix * ) ;
 #endif
diff --git a/src/maths/Makefile.am b/src/maths/Makefile.am
index 5d170edba..81b37c29b 100644
--- a/src/maths/Makefile.am
+++ b/src/maths/Makefile.am
@@ -8,8 +8,21 @@ SUBDIRS += KLU
 DIST_SUBDIRS += KLU
 endif
 
-MAINTAINERCLEANFILES = Makefile.in KLU/Makefile.in
-
-if KLU_WANTED
-MAINTAINERCLEANFILES -= KLU/Makefile.in
+if SuperLU_WANTED
+SUBDIRS += SuperLU
+DIST_SUBDIRS += SuperLU
+endif
+
+MAINTAINERCLEANFILES = Makefile.in
+
+if !KLU_WANTED
+if SuperLU_WANTED
+MAINTAINERCLEANFILES += KLU/Makefile.in
+else
+MAINTAINERCLEANFILES += KLU/Makefile.in SuperLU/Makefile.in
+endif
+else
+if !SuperLU_WANTED
+MAINTAINERCLEANFILES += SuperLU/Makefile.in
+endif
 endif
diff --git a/src/maths/ni/niinit.c b/src/maths/ni/niinit.c
index 952cb534c..45cb8035c 100644
--- a/src/maths/ni/niinit.c
+++ b/src/maths/ni/niinit.c
@@ -31,7 +31,7 @@ NIinit(CKTcircuit *ckt)
 /* Allocation of the new SMPmatrix structure - Francesco Lannuti (2012-02) */
     ckt->CKTmatrix = TMALLOC (SMPmatrix, 1) ;
 
-#ifdef KLU
+#if defined(KLU)
     ckt->CKTmatrix->CKTkluCommon = TMALLOC (klu_common, 1) ;
     ckt->CKTmatrix->CKTkluSymbolic = NULL ;
     ckt->CKTmatrix->CKTkluNumeric = NULL ;
@@ -49,6 +49,23 @@ NIinit(CKTcircuit *ckt)
     ckt->CKTmatrix->CKTkluMODE = CKTkluON ; /* TO BE SUBSTITUTED WITH THE HEURISTICS */
 
     klu_defaults (ckt->CKTmatrix->CKTkluCommon) ;
+
+#elif defined(SuperLU)
+    ckt->CKTmatrix->CKTsuperluAp = NULL ;
+    ckt->CKTmatrix->CKTsuperluAi = NULL ;
+    ckt->CKTmatrix->CKTsuperluAx = NULL ;
+    ckt->CKTmatrix->CKTsuperluPerm_r = NULL ;
+    ckt->CKTmatrix->CKTsuperluPerm_c = NULL ;
+    ckt->CKTmatrix->CKTsuperluInfo = 0 ;
+    ckt->CKTmatrix->CKTsuperluEtree = NULL ;
+    ckt->CKTmatrix->CKTsuperluIntermediate = NULL ;
+    ckt->CKTmatrix->CKTbind_Sparse = NULL ;
+    ckt->CKTmatrix->CKTbind_CSC = NULL ;
+    ckt->CKTmatrix->CKTbind_CSC_Complex = NULL ;
+    ckt->CKTmatrix->CKTdiag_CSC = NULL ;
+    ckt->CKTmatrix->CKTsuperluN = 0 ;
+    ckt->CKTmatrix->CKTsuperlunz = 0 ;
+    ckt->CKTmatrix->CKTsuperluMODE = CKTsuperluON ; /* TO BE SUBSTITUTED WITH THE HEURISTICS */
 #endif
 
     ckt->CKTniState = NIUNINITIALIZED;
diff --git a/src/maths/sparse/Makefile.am b/src/maths/sparse/Makefile.am
index 9767c159c..81e7c3c42 100644
--- a/src/maths/sparse/Makefile.am
+++ b/src/maths/sparse/Makefile.am
@@ -17,8 +17,12 @@ libsparse_la_SOURCES = \
 if KLU_WANTED
 libsparse_la_SOURCES += spCSC.c
 else
+if SuperLU_WANTED
+libsparse_la_SOURCES += spCSC.c
+else
 libsparse_la_SOURCES += spsmp.c
 endif
+endif
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
diff --git a/src/spicelib/analysis/cktop.c b/src/spicelib/analysis/cktop.c
index 4e3f1074a..98ba54297 100644
--- a/src/spicelib/analysis/cktop.c
+++ b/src/spicelib/analysis/cktop.c
@@ -27,7 +27,7 @@ CKTop (CKTcircuit * ckt, long int firstmode, long int continuemode,
 #endif
 ckt->CKTmode = firstmode;
 
-#ifdef KLU
+#if defined(KLU)
     if (ckt->CKTmatrix->CKTkluMODE) {
 
         int i ;
@@ -46,6 +46,39 @@ ckt->CKTmode = firstmode;
 
         SMPmatrix_CSC (ckt->CKTmatrix) ;
 
+        for (i = 0 ; i < DEVmaxnum ; i++)
+            if (DEVices [i] && DEVices [i]->DEVbindCSC)
+                DEVices [i]->DEVbindCSC (ckt->CKThead [i], ckt) ;
+    }
+#elif defined(SuperLU)
+    if (ckt->CKTmatrix->CKTsuperluMODE)
+    {
+        int i ;
+        int n  = ckt->CKTmatrix->CKTsuperluN ;
+        int nz = ckt->CKTmatrix->CKTsuperlunz ;
+
+	ckt->CKTmatrix->CKTsuperluAp = 		TMALLOC (int, n + 1) ;
+	ckt->CKTmatrix->CKTsuperluAi = 		TMALLOC (int, nz) ;
+	ckt->CKTmatrix->CKTsuperluAx = 		TMALLOC (double, nz) ;
+	ckt->CKTmatrix->CKTsuperluPerm_c = 	TMALLOC (int, n) ;
+	ckt->CKTmatrix->CKTsuperluPerm_r = 	TMALLOC (int, n) ;
+	ckt->CKTmatrix->CKTsuperluEtree = 		TMALLOC (int, n) ;
+
+	ckt->CKTmatrix->CKTsuperluIntermediate = 	TMALLOC (double, n) ;
+
+	ckt->CKTmatrix->CKTbind_Sparse = 	TMALLOC (double *, nz) ;
+	ckt->CKTmatrix->CKTbind_CSC = 		TMALLOC (double *, nz) ;
+
+	ckt->CKTmatrix->CKTdiag_CSC = 	TMALLOC (double *, n) ;
+
+        SMPmatrix_CSC (ckt->CKTmatrix) ;
+
+	dCreate_CompCol_Matrix (&(ckt->CKTmatrix->CKTsuperluA), n, n, nz, ckt->CKTmatrix->CKTsuperluAx,
+                                ckt->CKTmatrix->CKTsuperluAi, ckt->CKTmatrix->CKTsuperluAp, SLU_NC, SLU_D, SLU_GE) ;
+	dCreate_Dense_Matrix (&(ckt->CKTmatrix->CKTsuperluI), n, 1, ckt->CKTmatrix->CKTsuperluIntermediate,
+                              n, SLU_DN, SLU_D, SLU_GE) ;
+	StatInit (&(ckt->CKTmatrix->CKTsuperluStat)) ;
+
         for (i = 0 ; i < DEVmaxnum ; i++)
             if (DEVices [i] && DEVices [i]->DEVbindCSC)
                 DEVices [i]->DEVbindCSC (ckt->CKThead [i], ckt) ;
diff --git a/src/spicelib/analysis/cktsetup.c b/src/spicelib/analysis/cktsetup.c
index 5cabc6ba6..95dd9c622 100644
--- a/src/spicelib/analysis/cktsetup.c
+++ b/src/spicelib/analysis/cktsetup.c
@@ -78,9 +78,12 @@ CKTsetup(CKTcircuit *ckt)
         }
     }
 
-#ifdef KLU
+#if defined(KLU)
     if (ckt->CKTmatrix->CKTkluMODE)
         SMPnnz (ckt->CKTmatrix) ;
+#elif defined(SuperLU)
+    if (ckt->CKTmatrix->CKTsuperluMODE)
+        SMPnnz (ckt->CKTmatrix) ;
 #endif
 
     for(i=0;i<=MAX(2,ckt->CKTmaxOrder)+1;i++) { /* dctran needs 3 states as minimum */
diff --git a/src/spicelib/devices/asrc/asrcinit.c b/src/spicelib/devices/asrc/asrcinit.c
index 37bf5b990..df33f64a0 100644
--- a/src/spicelib/devices/asrc/asrcinit.c
+++ b/src/spicelib/devices/asrc/asrcinit.c
@@ -74,7 +74,7 @@ SPICEdev ASRCinfo = {
 #endif                    
  /* DEVinstSize   */ &ASRCiSize,
  /* DEVmodSize    */ &ASRCmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   NULL,
  /* DEVbindCSCComplex */   NULL,
 #endif
diff --git a/src/spicelib/devices/bjt/Makefile.am b/src/spicelib/devices/bjt/Makefile.am
index 3f8d26bfd..cb338a242 100644
--- a/src/spicelib/devices/bjt/Makefile.am
+++ b/src/spicelib/devices/bjt/Makefile.am
@@ -39,6 +39,10 @@ if KLU_WANTED
 libbjt_la_SOURCES += bjtbindCSC.c
 endif
 
+if SuperLU_WANTED
+libbjt_la_SOURCES += bjtbindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
 
diff --git a/src/spicelib/devices/bjt/bjtext.h b/src/spicelib/devices/bjt/bjtext.h
index 105611872..4c20fea7c 100644
--- a/src/spicelib/devices/bjt/bjtext.h
+++ b/src/spicelib/devices/bjt/bjtext.h
@@ -34,7 +34,7 @@ extern int BJTdSetup(GENmodel*, register CKTcircuit*);
 
 #endif
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int BJTbindCSC(GENmodel*, CKTcircuit*);
 extern int BJTbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/bjt/bjtinit.c b/src/spicelib/devices/bjt/bjtinit.c
index b511216c0..ee6ee678e 100644
--- a/src/spicelib/devices/bjt/bjtinit.c
+++ b/src/spicelib/devices/bjt/bjtinit.c
@@ -73,7 +73,7 @@ SPICEdev BJTinfo = {                  /* description from struct IFdevice  */
 #endif                     
  /* DEVinstSize   */ &BJTiSize,
  /* DEVmodSize    */ &BJTmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   BJTbindCSC,
  /* DEVbindCSCComplex */   BJTbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/bsim1/Makefile.am b/src/spicelib/devices/bsim1/Makefile.am
index 62ae1816a..f8e3cf75d 100644
--- a/src/spicelib/devices/bsim1/Makefile.am
+++ b/src/spicelib/devices/bsim1/Makefile.am
@@ -35,6 +35,11 @@ if KLU_WANTED
 libbsim1_la_SOURCES += b1bindCSC.c
 endif
 
+if SuperLU_WANTED
+libbsim1_la_SOURCES += b1bindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim1/bsim1ext.h b/src/spicelib/devices/bsim1/bsim1ext.h
index 2accd47b7..1e056d442 100644
--- a/src/spicelib/devices/bsim1/bsim1ext.h
+++ b/src/spicelib/devices/bsim1/bsim1ext.h
@@ -30,7 +30,7 @@ extern int B1trunc(GENmodel*,CKTcircuit*,double*);
 extern int B1disto(int,GENmodel*,CKTcircuit*);
 extern int B1dSetup(GENmodel*, register CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int B1bindCSC(GENmodel*, CKTcircuit*);
 extern int B1bindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/bsim1/bsim1init.c b/src/spicelib/devices/bsim1/bsim1init.c
index 9ba9e6253..7ad4e5682 100644
--- a/src/spicelib/devices/bsim1/bsim1init.c
+++ b/src/spicelib/devices/bsim1/bsim1init.c
@@ -73,7 +73,7 @@ SPICEdev B1info = {
 #endif    
  /* DEVinstSize   */ &B1iSize,
  /* DEVmodSize    */ &B1mSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   B1bindCSC,
  /* DEVbindCSCComplex */   B1bindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/bsim2/Makefile.am b/src/spicelib/devices/bsim2/Makefile.am
index 97597da11..a86e3ceb3 100644
--- a/src/spicelib/devices/bsim2/Makefile.am
+++ b/src/spicelib/devices/bsim2/Makefile.am
@@ -33,6 +33,10 @@ if KLU_WANTED
 libbsim2_la_SOURCES += b2bindCSC.c
 endif
 
+if SuperLU_WANTED
+libbsim2_la_SOURCES += b2bindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
 
diff --git a/src/spicelib/devices/bsim2/bsim2ext.h b/src/spicelib/devices/bsim2/bsim2ext.h
index e931afd0b..31b3a8a28 100644
--- a/src/spicelib/devices/bsim2/bsim2ext.h
+++ b/src/spicelib/devices/bsim2/bsim2ext.h
@@ -26,7 +26,7 @@ extern int B2unsetup(GENmodel*,CKTcircuit*);
 extern int B2temp(GENmodel*,CKTcircuit*);
 extern int B2trunc(GENmodel*,CKTcircuit*,double*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int B2bindCSC(GENmodel*, CKTcircuit*);
 extern int B2bindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/bsim2/bsim2init.c b/src/spicelib/devices/bsim2/bsim2init.c
index f64a37563..cbe19a373 100644
--- a/src/spicelib/devices/bsim2/bsim2init.c
+++ b/src/spicelib/devices/bsim2/bsim2init.c
@@ -73,7 +73,7 @@ SPICEdev B2info = {
 #endif    
  /* DEVinstSize   */ &B2iSize,
  /* DEVmodSize    */ &B2mSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   B2bindCSC,
  /* DEVbindCSCComplex */   B2bindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/bsim3/Makefile.am b/src/spicelib/devices/bsim3/Makefile.am
index 3a36f0207..3342ef859 100644
--- a/src/spicelib/devices/bsim3/Makefile.am
+++ b/src/spicelib/devices/bsim3/Makefile.am
@@ -32,6 +32,10 @@ if KLU_WANTED
 libbsim3_la_SOURCES += b3bindCSC.c
 endif
 
+if SuperLU_WANTED
+libbsim3_la_SOURCES += b3bindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
 
diff --git a/src/spicelib/devices/bsim3/bsim3ext.h b/src/spicelib/devices/bsim3/bsim3ext.h
index b24190f1d..35a3a901b 100644
--- a/src/spicelib/devices/bsim3/bsim3ext.h
+++ b/src/spicelib/devices/bsim3/bsim3ext.h
@@ -29,7 +29,7 @@ extern int BSIM3trunc(GENmodel*,CKTcircuit*,double*);
 extern int BSIM3noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 extern int BSIM3unsetup(GENmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int BSIM3bindCSC(GENmodel*, CKTcircuit*);
 extern int BSIM3bindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/bsim3/bsim3init.c b/src/spicelib/devices/bsim3/bsim3init.c
index 70f7aa6e7..a9a1206b4 100644
--- a/src/spicelib/devices/bsim3/bsim3init.c
+++ b/src/spicelib/devices/bsim3/bsim3init.c
@@ -72,7 +72,7 @@ SPICEdev BSIM3info = {
 #endif                       
  /* DEVinstSize   */ &BSIM3iSize,
  /* DEVmodSize    */ &BSIM3mSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   BSIM3bindCSC,
  /* DEVbindCSCComplex */   BSIM3bindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/bsim3soi_dd/Makefile.am b/src/spicelib/devices/bsim3soi_dd/Makefile.am
index df3b14beb..48d65a3b2 100644
--- a/src/spicelib/devices/bsim3soi_dd/Makefile.am
+++ b/src/spicelib/devices/bsim3soi_dd/Makefile.am
@@ -32,6 +32,10 @@ if KLU_WANTED
 libbsim3soidd_la_SOURCES += b3soiddbindCSC.c
 endif
 
+if SuperLU_WANTED
+libbsim3soidd_la_SOURCES += b3soiddbindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
 
diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddext.h b/src/spicelib/devices/bsim3soi_dd/b3soiddext.h
index 77fb29dcc..6089eaea1 100644
--- a/src/spicelib/devices/bsim3soi_dd/b3soiddext.h
+++ b/src/spicelib/devices/bsim3soi_dd/b3soiddext.h
@@ -29,7 +29,7 @@ extern int B3SOIDDtrunc(GENmodel*,CKTcircuit*,double*);
 extern int B3SOIDDnoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 extern int B3SOIDDunsetup(GENmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int B3SOIDDbindCSC(GENmodel*, CKTcircuit*);
 extern int B3SOIDDbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c b/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c
index 563962bf0..8000021ef 100644
--- a/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c
+++ b/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c
@@ -70,7 +70,7 @@ SPICEdev B3SOIDDinfo = {
 #endif
  /* DEVinstSize   */ &B3SOIDDiSize,
  /* DEVmodSize    */ &B3SOIDDmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   B3SOIDDbindCSC,
  /* DEVbindCSCComplex */   B3SOIDDbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/bsim3soi_fd/Makefile.am b/src/spicelib/devices/bsim3soi_fd/Makefile.am
index dad13649e..36580e21f 100644
--- a/src/spicelib/devices/bsim3soi_fd/Makefile.am
+++ b/src/spicelib/devices/bsim3soi_fd/Makefile.am
@@ -32,6 +32,10 @@ if KLU_WANTED
 libbsim3soifd_la_SOURCES += b3soifdbindCSC.c
 endif
 
+if SuperLU_WANTED
+libbsim3soifd_la_SOURCES += b3soifdbindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
 
diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdext.h b/src/spicelib/devices/bsim3soi_fd/b3soifdext.h
index b699d268e..bdeb9d40f 100644
--- a/src/spicelib/devices/bsim3soi_fd/b3soifdext.h
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifdext.h
@@ -30,7 +30,7 @@ extern int B3SOIFDnoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 extern int B3SOIFDunsetup(GENmodel*,CKTcircuit*);
 
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int B3SOIFDbindCSC(GENmodel*, CKTcircuit*);
 extern int B3SOIFDbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdinit.c b/src/spicelib/devices/bsim3soi_fd/b3soifdinit.c
index 2611310de..01267aaeb 100644
--- a/src/spicelib/devices/bsim3soi_fd/b3soifdinit.c
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifdinit.c
@@ -71,7 +71,7 @@ SPICEdev B3SOIFDinfo = {
 #endif    
  /* DEVinstSize*/	&B3SOIFDiSize,
  /* DEVmodSize*/	&B3SOIFDmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   B3SOIFDbindCSC,
  /* DEVbindCSCComplex */   B3SOIFDbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/bsim3soi_pd/Makefile.am b/src/spicelib/devices/bsim3soi_pd/Makefile.am
index 5c426c521..abf8b3ac8 100644
--- a/src/spicelib/devices/bsim3soi_pd/Makefile.am
+++ b/src/spicelib/devices/bsim3soi_pd/Makefile.am
@@ -32,6 +32,10 @@ if KLU_WANTED
 libbsim3soipd_la_SOURCES += b3soipdbindCSC.c
 endif
 
+if SuperLU_WANTED
+libbsim3soipd_la_SOURCES += b3soipdbindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
 
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdext.h b/src/spicelib/devices/bsim3soi_pd/b3soipdext.h
index e41c9cb10..4294f7fa6 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipdext.h
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdext.h
@@ -29,7 +29,7 @@ extern int B3SOIPDtrunc(GENmodel*,CKTcircuit*,double*);
 extern int B3SOIPDnoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 extern int B3SOIPDunsetup(GENmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int B3SOIPDbindCSC(GENmodel*, CKTcircuit*);
 extern int B3SOIPDbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdinit.c b/src/spicelib/devices/bsim3soi_pd/b3soipdinit.c
index 81096ab8f..893f4bbab 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipdinit.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdinit.c
@@ -72,7 +72,7 @@ SPICEdev B3SOIPDinfo = {
 #endif
  /* DEVinstSize*/   &B3SOIPDiSize,
  /* DEVmodSize*/    &B3SOIPDmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   B3SOIPDbindCSC,
  /* DEVbindCSCComplex */   B3SOIPDbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/bsim3v0/Makefile.am b/src/spicelib/devices/bsim3v0/Makefile.am
index 8273566bf..938947554 100644
--- a/src/spicelib/devices/bsim3v0/Makefile.am
+++ b/src/spicelib/devices/bsim3v0/Makefile.am
@@ -31,6 +31,10 @@ if KLU_WANTED
 libbsim3v0_la_SOURCES += b3v0bindCSC.c
 endif
 
+if SuperLU_WANTED
+libbsim3v0_la_SOURCES += b3v0bindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
 
diff --git a/src/spicelib/devices/bsim3v0/bsim3v0ext.h b/src/spicelib/devices/bsim3v0/bsim3v0ext.h
index 621ab51c1..d6588a811 100644
--- a/src/spicelib/devices/bsim3v0/bsim3v0ext.h
+++ b/src/spicelib/devices/bsim3v0/bsim3v0ext.h
@@ -29,7 +29,7 @@ extern int BSIM3v0noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 extern int  BSIM3v0unsetup(GENmodel *, CKTcircuit *);
 
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int BSIM3v0bindCSC(GENmodel*, CKTcircuit*);
 extern int BSIM3v0bindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/bsim3v0/bsim3v0init.c b/src/spicelib/devices/bsim3v0/bsim3v0init.c
index cc460ef31..ac5eb4906 100644
--- a/src/spicelib/devices/bsim3v0/bsim3v0init.c
+++ b/src/spicelib/devices/bsim3v0/bsim3v0init.c
@@ -71,7 +71,7 @@ SPICEdev B3v0info = {
 #endif                    
  /* DEVinstSize   */ &BSIM3v0iSize,
  /* DEVmodSize    */ &BSIM3v0mSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   BSIM3v0bindCSC,
  /* DEVbindCSCComplex */   BSIM3v0bindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/bsim3v1/Makefile.am b/src/spicelib/devices/bsim3v1/Makefile.am
index 3b22e68ce..7c77ccad5 100644
--- a/src/spicelib/devices/bsim3v1/Makefile.am
+++ b/src/spicelib/devices/bsim3v1/Makefile.am
@@ -32,6 +32,10 @@ if KLU_WANTED
 libbsim3v1_la_SOURCES += b3v1bindCSC.c
 endif
 
+if SuperLU_WANTED
+libbsim3v1_la_SOURCES += b3v1bindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
 
diff --git a/src/spicelib/devices/bsim3v1/bsim3v1ext.h b/src/spicelib/devices/bsim3v1/bsim3v1ext.h
index c5f723928..c8ac66621 100644
--- a/src/spicelib/devices/bsim3v1/bsim3v1ext.h
+++ b/src/spicelib/devices/bsim3v1/bsim3v1ext.h
@@ -30,7 +30,7 @@ extern int BSIM3v1noise(int, int, GENmodel *, CKTcircuit *, Ndata *, double *);
 extern int BSIM3v1unsetup(GENmodel *, CKTcircuit *);
 
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int BSIM3v1bindCSC(GENmodel*, CKTcircuit*);
 extern int BSIM3v1bindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/bsim3v1/bsim3v1init.c b/src/spicelib/devices/bsim3v1/bsim3v1init.c
index c0415e98b..6d5aa9ab4 100644
--- a/src/spicelib/devices/bsim3v1/bsim3v1init.c
+++ b/src/spicelib/devices/bsim3v1/bsim3v1init.c
@@ -71,7 +71,7 @@ SPICEdev BSIM3v1info = {
 #endif                    
  /* DEVinstSize   */ &BSIM3v1iSize,
  /* DEVmodSize    */ &BSIM3v1mSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   BSIM3v1bindCSC,
  /* DEVbindCSCComplex */   BSIM3v1bindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/bsim3v32/Makefile.am b/src/spicelib/devices/bsim3v32/Makefile.am
index 6db93d780..15b36a7e0 100644
--- a/src/spicelib/devices/bsim3v32/Makefile.am
+++ b/src/spicelib/devices/bsim3v32/Makefile.am
@@ -32,6 +32,10 @@ if KLU_WANTED
 libbsim3v32_la_SOURCES += b3v32bindCSC.c
 endif
 
+if SuperLU_WANTED
+libbsim3v32_la_SOURCES += b3v32bindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
 
diff --git a/src/spicelib/devices/bsim3v32/bsim3v32ext.h b/src/spicelib/devices/bsim3v32/bsim3v32ext.h
index 7f96aa39d..7556020ab 100644
--- a/src/spicelib/devices/bsim3v32/bsim3v32ext.h
+++ b/src/spicelib/devices/bsim3v32/bsim3v32ext.h
@@ -30,7 +30,7 @@ extern int BSIM3v32trunc(GENmodel*,CKTcircuit*,double*);
 extern int BSIM3v32noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 extern int BSIM3v32unsetup(GENmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int BSIM3v32bindCSC(GENmodel*, CKTcircuit*);
 extern int BSIM3v32bindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/bsim3v32/bsim3v32init.c b/src/spicelib/devices/bsim3v32/bsim3v32init.c
index eddffce54..3ed236352 100644
--- a/src/spicelib/devices/bsim3v32/bsim3v32init.c
+++ b/src/spicelib/devices/bsim3v32/bsim3v32init.c
@@ -72,7 +72,7 @@ SPICEdev BSIM3v32info = {
 #endif                       
  /* DEVinstSize   */ &BSIM3v32iSize,
  /* DEVmodSize    */ &BSIM3v32mSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   BSIM3v32bindCSC,
  /* DEVbindCSCComplex */   BSIM3v32bindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/bsim4/Makefile.am b/src/spicelib/devices/bsim4/Makefile.am
index 6f1dfbbf4..d279e4c43 100644
--- a/src/spicelib/devices/bsim4/Makefile.am
+++ b/src/spicelib/devices/bsim4/Makefile.am
@@ -33,6 +33,10 @@ if KLU_WANTED
 libbsim4_la_SOURCES += b4bindCSC.c
 endif
 
+if SuperLU_WANTED
+libbsim4_la_SOURCES += b4bindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
 
diff --git a/src/spicelib/devices/bsim4/bsim4ext.h b/src/spicelib/devices/bsim4/bsim4ext.h
index 3209c7d57..5c5470485 100644
--- a/src/spicelib/devices/bsim4/bsim4ext.h
+++ b/src/spicelib/devices/bsim4/bsim4ext.h
@@ -29,7 +29,7 @@ extern int BSIM4trunc(GENmodel*,CKTcircuit*,double*);
 extern int BSIM4noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 extern int BSIM4unsetup(GENmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int BSIM4bindCSC(GENmodel*, CKTcircuit*);
 extern int BSIM4bindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/bsim4/bsim4init.c b/src/spicelib/devices/bsim4/bsim4init.c
index e77bee554..69a7133db 100644
--- a/src/spicelib/devices/bsim4/bsim4init.c
+++ b/src/spicelib/devices/bsim4/bsim4init.c
@@ -73,7 +73,7 @@ SPICEdev BSIM4info = {
 #endif
     &BSIM4iSize,   /* DEVinstSize    */
     &BSIM4mSize,   /* DEVmodSize     */
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   BSIM4bindCSC,
  /* DEVbindCSCComplex */   BSIM4bindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/bsim4v4/Makefile.am b/src/spicelib/devices/bsim4v4/Makefile.am
index 8a70506b8..9e75f81d4 100644
--- a/src/spicelib/devices/bsim4v4/Makefile.am
+++ b/src/spicelib/devices/bsim4v4/Makefile.am
@@ -33,6 +33,10 @@ if KLU_WANTED
 libbsim4v4_la_SOURCES += b4v4bindCSC.c
 endif
 
+if SuperLU_WANTED
+libbsim4v4_la_SOURCES += b4v4bindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
 
diff --git a/src/spicelib/devices/bsim4v4/bsim4v4ext.h b/src/spicelib/devices/bsim4v4/bsim4v4ext.h
index 4741f36ee..22d8ad741 100644
--- a/src/spicelib/devices/bsim4v4/bsim4v4ext.h
+++ b/src/spicelib/devices/bsim4v4/bsim4v4ext.h
@@ -32,7 +32,7 @@ extern int BSIM4v4unsetup(GENmodel*,CKTcircuit*);
 
 
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int BSIM4v4bindCSC(GENmodel*, CKTcircuit*);
 extern int BSIM4v4bindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/bsim4v4/bsim4v4init.c b/src/spicelib/devices/bsim4v4/bsim4v4init.c
index 2e328e5a3..36fbe2f24 100644
--- a/src/spicelib/devices/bsim4v4/bsim4v4init.c
+++ b/src/spicelib/devices/bsim4v4/bsim4v4init.c
@@ -73,7 +73,7 @@ SPICEdev BSIM4v4info = {
 #endif
     &BSIM4v4iSize,   /* DEVinstSize    */
     &BSIM4v4mSize,   /* DEVmodSize     */
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   BSIM4v4bindCSC,
  /* DEVbindCSCComplex */   BSIM4v4bindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/bsim4v5/Makefile.am b/src/spicelib/devices/bsim4v5/Makefile.am
index a16c1fdb3..7a01dadb6 100644
--- a/src/spicelib/devices/bsim4v5/Makefile.am
+++ b/src/spicelib/devices/bsim4v5/Makefile.am
@@ -33,6 +33,10 @@ if KLU_WANTED
 libbsim4v5_la_SOURCES += b4v5bindCSC.c
 endif
 
+if SuperLU_WANTED
+libbsim4v5_la_SOURCES += b4v5bindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
 
diff --git a/src/spicelib/devices/bsim4v5/bsim4v5ext.h b/src/spicelib/devices/bsim4v5/bsim4v5ext.h
index c256b61f6..e78d5877a 100644
--- a/src/spicelib/devices/bsim4v5/bsim4v5ext.h
+++ b/src/spicelib/devices/bsim4v5/bsim4v5ext.h
@@ -29,7 +29,7 @@ extern int BSIM4v5trunc(GENmodel*,CKTcircuit*,double*);
 extern int BSIM4v5noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 extern int BSIM4v5unsetup(GENmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int BSIM4v5bindCSC(GENmodel*, CKTcircuit*);
 extern int BSIM4v5bindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/bsim4v5/bsim4v5init.c b/src/spicelib/devices/bsim4v5/bsim4v5init.c
index a725ee969..ff8f506c8 100644
--- a/src/spicelib/devices/bsim4v5/bsim4v5init.c
+++ b/src/spicelib/devices/bsim4v5/bsim4v5init.c
@@ -73,7 +73,7 @@ SPICEdev BSIM4v5info = {
 #endif
     &BSIM4v5iSize,   /* DEVinstSize    */
     &BSIM4v5mSize,   /* DEVmodSize     */
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   BSIM4v5bindCSC,
  /* DEVbindCSCComplex */   BSIM4v5bindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/bsim4v6/Makefile.am b/src/spicelib/devices/bsim4v6/Makefile.am
index 3222c3abc..eb9be0fc0 100644
--- a/src/spicelib/devices/bsim4v6/Makefile.am
+++ b/src/spicelib/devices/bsim4v6/Makefile.am
@@ -32,6 +32,9 @@ if KLU_WANTED
 libbsim4v6_la_SOURCES += b4v6bindCSC.c
 endif
 
+if SuperLU_WANTED
+libbsim4v6_la_SOURCES += b4v6bindCSC.c
+endif
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
diff --git a/src/spicelib/devices/bsim4v6/bsim4v6ext.h b/src/spicelib/devices/bsim4v6/bsim4v6ext.h
index fcb80e4e4..a99767ab4 100644
--- a/src/spicelib/devices/bsim4v6/bsim4v6ext.h
+++ b/src/spicelib/devices/bsim4v6/bsim4v6ext.h
@@ -29,7 +29,7 @@ extern int BSIM4v6trunc(GENmodel*,CKTcircuit*,double*);
 extern int BSIM4v6noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 extern int BSIM4v6unsetup(GENmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int BSIM4v6bindCSC(GENmodel*, CKTcircuit*);
 extern int BSIM4v6bindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/bsim4v6/bsim4v6init.c b/src/spicelib/devices/bsim4v6/bsim4v6init.c
index 7fc042bab..211114e1b 100644
--- a/src/spicelib/devices/bsim4v6/bsim4v6init.c
+++ b/src/spicelib/devices/bsim4v6/bsim4v6init.c
@@ -73,7 +73,7 @@ SPICEdev BSIM4v6info = {
 #endif
     &BSIM4v6iSize,   /* DEVinstSize    */
     &BSIM4v6mSize,   /* DEVmodSize     */
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
     BSIM4v6bindCSC,        /* DEVbindklu        */
     BSIM4v6bindCSCComplex, /* DEVbindkluComplex */
 #endif
diff --git a/src/spicelib/devices/bsimsoi/Makefile.am b/src/spicelib/devices/bsimsoi/Makefile.am
index adb78a748..df71097bc 100644
--- a/src/spicelib/devices/bsimsoi/Makefile.am
+++ b/src/spicelib/devices/bsimsoi/Makefile.am
@@ -32,6 +32,10 @@ if KLU_WANTED
 libbsim4soi_la_SOURCES += b4soibindCSC.c
 endif
 
+if SuperLU_WANTED
+libbsim4soi_la_SOURCES += b4soibindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
 
diff --git a/src/spicelib/devices/bsimsoi/b4soiext.h b/src/spicelib/devices/bsimsoi/b4soiext.h
index 67a40acd2..71c748355 100644
--- a/src/spicelib/devices/bsimsoi/b4soiext.h
+++ b/src/spicelib/devices/bsimsoi/b4soiext.h
@@ -31,7 +31,7 @@ extern int B4SOItrunc(GENmodel*,CKTcircuit*,double*);
 extern int B4SOInoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 extern int B4SOIunsetup(GENmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int B4SOIbindCSC(GENmodel*, CKTcircuit*);
 extern int B4SOIbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/bsimsoi/b4soiinit.c b/src/spicelib/devices/bsimsoi/b4soiinit.c
index cf9582cd0..c8d7621ce 100644
--- a/src/spicelib/devices/bsimsoi/b4soiinit.c
+++ b/src/spicelib/devices/bsimsoi/b4soiinit.c
@@ -71,7 +71,7 @@ SPICEdev B4SOIinfo = {
 #endif
  /* DEVinstSize   */ &B4SOIiSize,
  /* DEVmodSize    */ &B4SOImSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   B4SOIbindCSC,
  /* DEVbindCSCComplex */   B4SOIbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/cap/Makefile.am b/src/spicelib/devices/cap/Makefile.am
index 9fa90ef1b..27f63647f 100644
--- a/src/spicelib/devices/cap/Makefile.am
+++ b/src/spicelib/devices/cap/Makefile.am
@@ -33,6 +33,9 @@ if KLU_WANTED
 libcap_la_SOURCES += capbindCSC.c
 endif
 
+if SuperLU_WANTED
+libcap_la_SOURCES += capbindCSC.c
+endif
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
diff --git a/src/spicelib/devices/cap/capext.h b/src/spicelib/devices/cap/capext.h
index 65276205f..852087272 100644
--- a/src/spicelib/devices/cap/capext.h
+++ b/src/spicelib/devices/cap/capext.h
@@ -23,7 +23,7 @@ extern int CAPsetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
 extern int CAPtemp(GENmodel*,CKTcircuit*);
 extern int CAPtrunc(GENmodel*,CKTcircuit*,double*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int CAPbindCSC(GENmodel*, CKTcircuit*);
 extern int CAPbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/cap/capinit.c b/src/spicelib/devices/cap/capinit.c
index fb9ad85f0..cea919a11 100644
--- a/src/spicelib/devices/cap/capinit.c
+++ b/src/spicelib/devices/cap/capinit.c
@@ -72,7 +72,7 @@ SPICEdev CAPinfo = {
 #endif    
  /* DEVinstSize   */ &CAPiSize,
  /* DEVmodSize    */ &CAPmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindklu        */  CAPbindCSC,
  /* DEVbindkluComplex */  CAPbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/cccs/Makefile.am b/src/spicelib/devices/cccs/Makefile.am
index dfc2af295..e12b34766 100644
--- a/src/spicelib/devices/cccs/Makefile.am
+++ b/src/spicelib/devices/cccs/Makefile.am
@@ -27,6 +27,10 @@ if KLU_WANTED
 libcccs_la_SOURCES += cccsbindCSC.c
 endif
 
+if SuperLU_WANTED
+libcccs_la_SOURCES += cccsbindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/cccs/cccsext.h b/src/spicelib/devices/cccs/cccsext.h
index 08cfa6b64..4212ecc9d 100644
--- a/src/spicelib/devices/cccs/cccsext.h
+++ b/src/spicelib/devices/cccs/cccsext.h
@@ -18,7 +18,7 @@ extern int CCCSsSetup(SENstruct*,GENmodel*);
 extern int CCCSsetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
 
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int CCCSbindCSC(GENmodel*, CKTcircuit*);
 extern int CCCSbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/cccs/cccsinit.c b/src/spicelib/devices/cccs/cccsinit.c
index dc6d615be..7a9eb7d65 100644
--- a/src/spicelib/devices/cccs/cccsinit.c
+++ b/src/spicelib/devices/cccs/cccsinit.c
@@ -72,7 +72,7 @@ SPICEdev CCCSinfo = {
 #endif    
  /* DEVinstSize   */ &CCCSiSize,
  /* DEVmodSize    */ &CCCSmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   CCCSbindCSC,
  /* DEVbindCSCComplex */   CCCSbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/ccvs/Makefile.am b/src/spicelib/devices/ccvs/Makefile.am
index 0faa88b17..bf3f7b6c9 100644
--- a/src/spicelib/devices/ccvs/Makefile.am
+++ b/src/spicelib/devices/ccvs/Makefile.am
@@ -28,6 +28,10 @@ if KLU_WANTED
 libccvs_la_SOURCES += ccvsbindCSC.c
 endif
 
+if SuperLU_WANTED
+libccvs_la_SOURCES += ccvsbindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
 
diff --git a/src/spicelib/devices/ccvs/ccvsext.h b/src/spicelib/devices/ccvs/ccvsext.h
index f78a1d848..fcc0a9070 100644
--- a/src/spicelib/devices/ccvs/ccvsext.h
+++ b/src/spicelib/devices/ccvs/ccvsext.h
@@ -18,7 +18,7 @@ extern int CCVSsSetup(SENstruct*,GENmodel*);
 extern int CCVSsetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
 extern int CCVSunsetup(GENmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int CCVSbindCSC(GENmodel*, CKTcircuit*);
 extern int CCVSbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/ccvs/ccvsinit.c b/src/spicelib/devices/ccvs/ccvsinit.c
index 9637551ed..30b0affb5 100644
--- a/src/spicelib/devices/ccvs/ccvsinit.c
+++ b/src/spicelib/devices/ccvs/ccvsinit.c
@@ -73,7 +73,7 @@ SPICEdev CCVSinfo = {
 #endif
  /* DEVinstSize   */ &CCVSiSize,
  /* DEVmodSize    */ &CCVSmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   CCVSbindCSC,
  /* DEVbindCSCComplex */   CCVSbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/cpl/cplinit.c b/src/spicelib/devices/cpl/cplinit.c
index cd62d07a5..85155af73 100644
--- a/src/spicelib/devices/cpl/cplinit.c
+++ b/src/spicelib/devices/cpl/cplinit.c
@@ -73,7 +73,7 @@ SPICEdev CPLinfo = {
 #endif   
 /* DEVinstSize    */ &CPLiSize,
 /* DEVmodSize     */ &CPLmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   NULL,
  /* DEVbindCSCComplex */   NULL,
 #endif
diff --git a/src/spicelib/devices/csw/Makefile.am b/src/spicelib/devices/csw/Makefile.am
index 4271aff55..ef5526aab 100644
--- a/src/spicelib/devices/csw/Makefile.am
+++ b/src/spicelib/devices/csw/Makefile.am
@@ -28,6 +28,10 @@ if KLU_WANTED
 libcsw_la_SOURCES += cswbindCSC.c
 endif
 
+if SuperLU_WANTED
+libcsw_la_SOURCES += cswbindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/csw/cswext.h b/src/spicelib/devices/csw/cswext.h
index b14de42b1..131f639c4 100644
--- a/src/spicelib/devices/csw/cswext.h
+++ b/src/spicelib/devices/csw/cswext.h
@@ -18,7 +18,7 @@ extern int CSWsetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
 extern int CSWnoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 extern int CSWtrunc(GENmodel*,CKTcircuit*,double*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int CSWbindCSC(GENmodel*, CKTcircuit*);
 extern int CSWbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/csw/cswinit.c b/src/spicelib/devices/csw/cswinit.c
index 117139e99..d4216e9ce 100644
--- a/src/spicelib/devices/csw/cswinit.c
+++ b/src/spicelib/devices/csw/cswinit.c
@@ -75,7 +75,7 @@ SPICEdev CSWinfo = {
 #endif
  /* DEVinstSize   */ &CSWiSize,
  /* DEVmodSize    */ &CSWmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   CSWbindCSC,
  /* DEVbindCSCComplex */   CSWbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/dio/Makefile.am b/src/spicelib/devices/dio/Makefile.am
index 88917abb4..c63a73202 100644
--- a/src/spicelib/devices/dio/Makefile.am
+++ b/src/spicelib/devices/dio/Makefile.am
@@ -38,6 +38,11 @@ if KLU_WANTED
 libdio_la_SOURCES += diobindCSC.c
 endif
 
+if SuperLU_WANTED
+libdio_la_SOURCES += diobindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/dio/dioext.h b/src/spicelib/devices/dio/dioext.h
index 6fce696f4..a96f8ab1c 100644
--- a/src/spicelib/devices/dio/dioext.h
+++ b/src/spicelib/devices/dio/dioext.h
@@ -29,7 +29,7 @@ extern int DIOdisto(int,GENmodel*,CKTcircuit*);
 extern int DIOnoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 extern int DIOdSetup(DIOmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int DIObindCSC(GENmodel*, CKTcircuit*);
 extern int DIObindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/dio/dioinit.c b/src/spicelib/devices/dio/dioinit.c
index 53e9f6c41..e215b3183 100644
--- a/src/spicelib/devices/dio/dioinit.c
+++ b/src/spicelib/devices/dio/dioinit.c
@@ -74,7 +74,7 @@ SPICEdev DIOinfo = {
 #endif                     
  /* DEVinstSize   */ &DIOiSize,
  /* DEVmodSize    */ &DIOmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   DIObindCSC,
  /* DEVbindCSCComplex */   DIObindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/hfet1/Makefile.am b/src/spicelib/devices/hfet1/Makefile.am
index fff5beb92..9bb207924 100644
--- a/src/spicelib/devices/hfet1/Makefile.am
+++ b/src/spicelib/devices/hfet1/Makefile.am
@@ -29,6 +29,11 @@ if KLU_WANTED
 libhfet_la_SOURCES += hfetbindCSC.c
 endif
 
+if SuperLU_WANTED
+libhfet_la_SOURCES += hfetbindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/hfet1/hfetext.h b/src/spicelib/devices/hfet1/hfetext.h
index f50441145..b93f8906f 100644
--- a/src/spicelib/devices/hfet1/hfetext.h
+++ b/src/spicelib/devices/hfet1/hfetext.h
@@ -19,7 +19,7 @@ extern int HFETAtemp(GENmodel*,CKTcircuit*);
 extern int HFETAtrunc(GENmodel*,CKTcircuit*,double*);
 extern int HFETAunsetup(GENmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int HFETAbindCSC(GENmodel*, CKTcircuit*);
 extern int HFETAbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/hfet1/hfetinit.c b/src/spicelib/devices/hfet1/hfetinit.c
index 1983864c5..b6ef13450 100644
--- a/src/spicelib/devices/hfet1/hfetinit.c
+++ b/src/spicelib/devices/hfet1/hfetinit.c
@@ -73,7 +73,7 @@ SPICEdev HFETAinfo = {
 #endif    
  /* DEVinstSize   */ &HFETAiSize,
  /* DEVmodSize    */ &HFETAmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   HFETAbindCSC,
  /* DEVbindCSCComplex */   HFETAbindCSC,
 #endif
diff --git a/src/spicelib/devices/hfet2/Makefile.am b/src/spicelib/devices/hfet2/Makefile.am
index 76c4e15e0..8d0b5ba36 100644
--- a/src/spicelib/devices/hfet2/Makefile.am
+++ b/src/spicelib/devices/hfet2/Makefile.am
@@ -29,6 +29,11 @@ if KLU_WANTED
 libhfet2_la_SOURCES += hfet2bindCSC.c
 endif
 
+if SuperLU_WANTED
+libhfet2_la_SOURCES += hfet2bindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/hfet2/hfet2ext.h b/src/spicelib/devices/hfet2/hfet2ext.h
index 1c1222e5a..192429b38 100644
--- a/src/spicelib/devices/hfet2/hfet2ext.h
+++ b/src/spicelib/devices/hfet2/hfet2ext.h
@@ -19,7 +19,7 @@ extern int  HFET2temp(GENmodel*,CKTcircuit*);
 extern int  HFET2trunc(GENmodel*,CKTcircuit*,double*);
 extern int  HFET2unsetup( GENmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int HFET2bindCSC(GENmodel*, CKTcircuit*);
 extern int HFET2bindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/hfet2/hfet2init.c b/src/spicelib/devices/hfet2/hfet2init.c
index 425eabe94..f53231c78 100644
--- a/src/spicelib/devices/hfet2/hfet2init.c
+++ b/src/spicelib/devices/hfet2/hfet2init.c
@@ -73,7 +73,7 @@ SPICEdev HFET2info = {
 #endif    
  /* DEVinstSize   */ &HFET2iSize,
  /* DEVmodSize    */ &HFET2mSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   HFET2bindCSC,
  /* DEVbindCSCComplex */   HFET2bindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/hisim2/Makefile.am b/src/spicelib/devices/hisim2/Makefile.am
index f673adccf..d766c0db4 100644
--- a/src/spicelib/devices/hisim2/Makefile.am
+++ b/src/spicelib/devices/hisim2/Makefile.am
@@ -35,6 +35,10 @@ if KLU_WANTED
 libhisim2_la_SOURCES += hsm2bindCSC.c
 endif
 
+if SuperLU_WANTED
+libhisim2_la_SOURCES += hsm2bindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
 
diff --git a/src/spicelib/devices/hisim2/hsm2ext.h b/src/spicelib/devices/hisim2/hsm2ext.h
index d8bdc2370..d86b666d4 100644
--- a/src/spicelib/devices/hisim2/hsm2ext.h
+++ b/src/spicelib/devices/hisim2/hsm2ext.h
@@ -38,7 +38,7 @@ extern int HSM2temp(GENmodel*,CKTcircuit*);
 extern int HSM2trunc(GENmodel*,CKTcircuit*,double*);
 extern int HSM2noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int HSM2bindCSC(GENmodel*, CKTcircuit*);
 extern int HSM2bindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/hisim2/hsm2init.c b/src/spicelib/devices/hisim2/hsm2init.c
index 3c0f9f39f..2b6520322 100644
--- a/src/spicelib/devices/hisim2/hsm2init.c
+++ b/src/spicelib/devices/hisim2/hsm2init.c
@@ -71,7 +71,7 @@ SPICEdev HSM2info = {
 #endif
  /* DEVinstSize   */ &HSM2iSize,
  /* DEVmodSize    */ &HSM2mSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   HSM2bindCSC,
  /* DEVbindCSCComplex */   HSM2bindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/hisimhv1/Makefile.am b/src/spicelib/devices/hisimhv1/Makefile.am
index 70ad8de72..f4b3421c5 100644
--- a/src/spicelib/devices/hisimhv1/Makefile.am
+++ b/src/spicelib/devices/hisimhv1/Makefile.am
@@ -36,6 +36,10 @@ if KLU_WANTED
 libhisimhv1_la_SOURCES += hsmhvbindCSC.c
 endif
 
+if SuperLU_WANTED
+libhisimhv1_la_SOURCES += hsmhvbindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
 
diff --git a/src/spicelib/devices/hisimhv1/hsmhvext.h b/src/spicelib/devices/hisimhv1/hsmhvext.h
index 03ee1cce3..148dbb294 100644
--- a/src/spicelib/devices/hisimhv1/hsmhvext.h
+++ b/src/spicelib/devices/hisimhv1/hsmhvext.h
@@ -38,7 +38,7 @@ extern int HSMHVtemp(GENmodel*,CKTcircuit*);
 extern int HSMHVtrunc(GENmodel*,CKTcircuit*,double*);
 extern int HSMHVnoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int HSMHVbindCSC(GENmodel*, CKTcircuit*);
 extern int HSMHVbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/hisimhv1/hsmhvinit.c b/src/spicelib/devices/hisimhv1/hsmhvinit.c
index f5a753589..96cb63bb9 100644
--- a/src/spicelib/devices/hisimhv1/hsmhvinit.c
+++ b/src/spicelib/devices/hisimhv1/hsmhvinit.c
@@ -71,7 +71,7 @@ SPICEdev HSMHVinfo = {
 #endif
  /* DEVinstSize   */ &HSMHViSize,
  /* DEVmodSize    */ &HSMHVmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   HSMHVbindCSC,
  /* DEVbindCSCComplex */   HSMHVbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/ind/Makefile.am b/src/spicelib/devices/ind/Makefile.am
index 5bc00ec2b..ef81f5086 100644
--- a/src/spicelib/devices/ind/Makefile.am
+++ b/src/spicelib/devices/ind/Makefile.am
@@ -44,6 +44,11 @@ if KLU_WANTED
 libind_la_SOURCES += indMUTbindCSC.c
 endif
 
+if SuperLU_WANTED
+libind_la_SOURCES += indMUTbindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/ind/indext.h b/src/spicelib/devices/ind/indext.h
index 268924247..f49889c61 100644
--- a/src/spicelib/devices/ind/indext.h
+++ b/src/spicelib/devices/ind/indext.h
@@ -37,7 +37,7 @@ extern int MUTsSetup(SENstruct*,GENmodel*);
 extern int MUTsetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
 extern int MUTtemp(GENmodel *inModel, CKTcircuit *ckt);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int INDbindCSC(GENmodel*, CKTcircuit*);
 extern int INDbindCSCComplex(GENmodel*, CKTcircuit*);
 extern int MUTbindCSC(GENmodel*, CKTcircuit*);
diff --git a/src/spicelib/devices/ind/indinit.c b/src/spicelib/devices/ind/indinit.c
index 5b06cddfd..f6a080466 100644
--- a/src/spicelib/devices/ind/indinit.c
+++ b/src/spicelib/devices/ind/indinit.c
@@ -72,7 +72,7 @@ SPICEdev INDinfo = {
 #endif                       
  /* DEVinstSize   */ &INDiSize,
  /* DEVmodSize    */ &INDmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   INDbindCSC,
  /* DEVbindCSCComplex */   INDbindCSCComplex,
 #endif
@@ -145,7 +145,7 @@ SPICEdev MUTinfo = {
 #endif  
     &MUTiSize,
     &MUTmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   MUTbindCSC,
  /* DEVbindCSCComplex */   MUTbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/isrc/isrcinit.c b/src/spicelib/devices/isrc/isrcinit.c
index ac696f35d..d35000dc6 100644
--- a/src/spicelib/devices/isrc/isrcinit.c
+++ b/src/spicelib/devices/isrc/isrcinit.c
@@ -73,7 +73,7 @@ SPICEdev ISRCinfo = {
 #endif                        
  /* DEVinstSize   */ &ISRCiSize,
  /* DEVmodSize    */ &ISRCmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   NULL,
  /* DEVbindCSCComplex */   NULL,
 #endif
diff --git a/src/spicelib/devices/jfet/Makefile.am b/src/spicelib/devices/jfet/Makefile.am
index 126c64fcc..75aa1b01e 100644
--- a/src/spicelib/devices/jfet/Makefile.am
+++ b/src/spicelib/devices/jfet/Makefile.am
@@ -32,6 +32,11 @@ if KLU_WANTED
 libjfet_la_SOURCES += jfetbindCSC.c
 endif
 
+if SuperLU_WANTED
+libjfet_la_SOURCES += jfetbindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/jfet/jfetext.h b/src/spicelib/devices/jfet/jfetext.h
index 268f5f20c..84e275c15 100644
--- a/src/spicelib/devices/jfet/jfetext.h
+++ b/src/spicelib/devices/jfet/jfetext.h
@@ -23,7 +23,7 @@ extern int JFETdisto(int,GENmodel*,CKTcircuit*);
 extern int JFETnoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 extern int JFETdSetup(GENmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int JFETbindCSC(GENmodel*, CKTcircuit*);
 extern int JFETbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/jfet/jfetinit.c b/src/spicelib/devices/jfet/jfetinit.c
index 3c1716073..4601dcfee 100644
--- a/src/spicelib/devices/jfet/jfetinit.c
+++ b/src/spicelib/devices/jfet/jfetinit.c
@@ -73,7 +73,7 @@ SPICEdev JFETinfo = {
 #endif                        
  /* DEVinstSize   */ &JFETiSize,
  /* DEVmodSize    */ &JFETmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   JFETbindCSC,
  /* DEVbindCSCComplex */   JFETbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/jfet2/Makefile.am b/src/spicelib/devices/jfet2/Makefile.am
index 8609cfb6d..45ba29c47 100644
--- a/src/spicelib/devices/jfet2/Makefile.am
+++ b/src/spicelib/devices/jfet2/Makefile.am
@@ -32,6 +32,11 @@ if KLU_WANTED
 libjfet2_la_SOURCES += jfet2bindCSC.c
 endif
 
+if SuperLU_WANTED
+libjfet2_la_SOURCES += jfet2bindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/jfet2/jfet2ext.h b/src/spicelib/devices/jfet2/jfet2ext.h
index abd15d7bf..1947872ba 100644
--- a/src/spicelib/devices/jfet2/jfet2ext.h
+++ b/src/spicelib/devices/jfet2/jfet2ext.h
@@ -23,7 +23,7 @@ extern int JFET2temp(GENmodel*,CKTcircuit*);
 extern int JFET2trunc(GENmodel*,CKTcircuit*,double*);
 extern int JFET2noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int JFET2bindCSC(GENmodel*, CKTcircuit*);
 extern int JFET2bindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/jfet2/jfet2init.c b/src/spicelib/devices/jfet2/jfet2init.c
index c92733f7e..49d4a73aa 100644
--- a/src/spicelib/devices/jfet2/jfet2init.c
+++ b/src/spicelib/devices/jfet2/jfet2init.c
@@ -73,7 +73,7 @@ SPICEdev JFET2info = {
 #endif                        
  /* DEVinstSize   */ &JFET2iSize,
  /* DEVmodSize    */ &JFET2mSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   JFET2bindCSC,
  /* DEVbindCSCComplex */   JFET2bindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/ltra/Makefile.am b/src/spicelib/devices/ltra/Makefile.am
index 0b1d18cb6..af95b43e1 100644
--- a/src/spicelib/devices/ltra/Makefile.am
+++ b/src/spicelib/devices/ltra/Makefile.am
@@ -29,6 +29,11 @@ if KLU_WANTED
 libltra_la_SOURCES += ltrabindCSC.c
 endif
 
+if SuperLU_WANTED
+libltra_la_SOURCES += ltrabindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/ltra/ltraext.h b/src/spicelib/devices/ltra/ltraext.h
index daf058073..01d08a29d 100644
--- a/src/spicelib/devices/ltra/ltraext.h
+++ b/src/spicelib/devices/ltra/ltraext.h
@@ -45,7 +45,7 @@ extern void LTRArcCoeffsSetup(double*,double*,double*,double*,double*,double*,in
 extern void LTRArlcCoeffsSetup(double*,double*,double*,double*,double*,double*,int,double,double,double,double,double*,int,double,int*);
 extern int LTRAstraightLineCheck(double,double,double,double,double,double,double,double);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int LTRAbindCSC(GENmodel*, CKTcircuit*);
 extern int LTRAbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/ltra/ltrainit.c b/src/spicelib/devices/ltra/ltrainit.c
index 6634b4e78..50d9750e7 100644
--- a/src/spicelib/devices/ltra/ltrainit.c
+++ b/src/spicelib/devices/ltra/ltrainit.c
@@ -73,7 +73,7 @@ SPICEdev LTRAinfo = {
 #endif                        
  /* DEVinstSize   */ &LTRAiSize,
  /* DEVmodSize    */ &LTRAmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   LTRAbindCSC,
  /* DEVbindCSCComplex */   LTRAbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/mes/Makefile.am b/src/spicelib/devices/mes/Makefile.am
index 9988ca7af..58feabcb9 100644
--- a/src/spicelib/devices/mes/Makefile.am
+++ b/src/spicelib/devices/mes/Makefile.am
@@ -32,6 +32,11 @@ if KLU_WANTED
 libmes_la_SOURCES += mesbindCSC.c
 endif
 
+if SuperLU_WANTED
+libmes_la_SOURCES += mesbindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mes/mesext.h b/src/spicelib/devices/mes/mesext.h
index e2ff4f85b..bd3c15f7a 100644
--- a/src/spicelib/devices/mes/mesext.h
+++ b/src/spicelib/devices/mes/mesext.h
@@ -24,7 +24,7 @@ extern int MESnoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 extern int MESdSetup(GENmodel*,CKTcircuit*);
 
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int MESbindCSC(GENmodel*, CKTcircuit*);
 extern int MESbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/mes/mesinit.c b/src/spicelib/devices/mes/mesinit.c
index 66317bf74..23db49c75 100644
--- a/src/spicelib/devices/mes/mesinit.c
+++ b/src/spicelib/devices/mes/mesinit.c
@@ -73,7 +73,7 @@ SPICEdev MESinfo = {
 #endif                        
  /* DEVinstSize   */ &MESiSize,
  /* DEVmodSize    */ &MESmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   MESbindCSC,
  /* DEVbindCSCComplex */   MESbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/mesa/Makefile.am b/src/spicelib/devices/mesa/Makefile.am
index 4c61219c3..ec6a3aa4e 100644
--- a/src/spicelib/devices/mesa/Makefile.am
+++ b/src/spicelib/devices/mesa/Makefile.am
@@ -29,6 +29,11 @@ if KLU_WANTED
 libmesa_la_SOURCES += mesabindCSC.c
 endif
 
+if SuperLU_WANTED
+libmesa_la_SOURCES += mesabindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mesa/mesaext.h b/src/spicelib/devices/mesa/mesaext.h
index 9ee04f462..9adde60ab 100644
--- a/src/spicelib/devices/mesa/mesaext.h
+++ b/src/spicelib/devices/mesa/mesaext.h
@@ -19,7 +19,7 @@ extern int MESAtemp(GENmodel*,CKTcircuit*);
 extern int MESAtrunc(GENmodel*,CKTcircuit*,double*);
 extern int MESAunsetup(GENmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int MESAbindCSC(GENmodel*, CKTcircuit*);
 extern int MESAbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/mesa/mesainit.c b/src/spicelib/devices/mesa/mesainit.c
index 237e0c577..5754bcf3f 100644
--- a/src/spicelib/devices/mesa/mesainit.c
+++ b/src/spicelib/devices/mesa/mesainit.c
@@ -73,7 +73,7 @@ SPICEdev MESAinfo = {
 #endif                        
  /* DEVinstSize   */ &MESAiSize,
  /* DEVmodSize    */ &MESAmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   MESAbindCSC,
  /* DEVbindCSCComplex */   MESAbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/mos1/Makefile.am b/src/spicelib/devices/mos1/Makefile.am
index 55d8b4cdb..6a55c7113 100644
--- a/src/spicelib/devices/mos1/Makefile.am
+++ b/src/spicelib/devices/mos1/Makefile.am
@@ -38,6 +38,11 @@ if KLU_WANTED
 libmos1_la_SOURCES += mos1bindCSC.c
 endif
 
+if SuperLU_WANTED
+libmos1_la_SOURCES += mos1bindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mos1/mos1ext.h b/src/spicelib/devices/mos1/mos1ext.h
index d0c85337f..0cb684cbf 100644
--- a/src/spicelib/devices/mos1/mos1ext.h
+++ b/src/spicelib/devices/mos1/mos1ext.h
@@ -29,7 +29,7 @@ extern int MOS1disto(int,GENmodel*,CKTcircuit*);
 extern int MOS1noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 extern int MOS1dSetup(GENmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int MOS1bindCSC(GENmodel*, CKTcircuit*);
 extern int MOS1bindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/mos1/mos1init.c b/src/spicelib/devices/mos1/mos1init.c
index 7ed1edb18..96bc1f048 100644
--- a/src/spicelib/devices/mos1/mos1init.c
+++ b/src/spicelib/devices/mos1/mos1init.c
@@ -73,7 +73,7 @@ SPICEdev MOS1info = {
 #endif                       
  /* DEVinstSize   */ &MOS1iSize,
  /* DEVmodSize    */ &MOS1mSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   MOS1bindCSC,
  /* DEVbindCSCComplex */   MOS1bindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/mos2/Makefile.am b/src/spicelib/devices/mos2/Makefile.am
index 22394e318..9aaa9ff6c 100644
--- a/src/spicelib/devices/mos2/Makefile.am
+++ b/src/spicelib/devices/mos2/Makefile.am
@@ -38,6 +38,11 @@ if KLU_WANTED
 libmos2_la_SOURCES += mos2bindCSC.c
 endif
 
+if SuperLU_WANTED
+libmos2_la_SOURCES += mos2bindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mos2/mos2ext.h b/src/spicelib/devices/mos2/mos2ext.h
index 50fbb1c70..86f6e677d 100644
--- a/src/spicelib/devices/mos2/mos2ext.h
+++ b/src/spicelib/devices/mos2/mos2ext.h
@@ -30,7 +30,7 @@ extern int MOS2noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 
 extern int MOS2dSetup(GENmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int MOS2bindCSC(GENmodel*, CKTcircuit*);
 extern int MOS2bindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/mos2/mos2init.c b/src/spicelib/devices/mos2/mos2init.c
index c3adf70f4..759f110e0 100644
--- a/src/spicelib/devices/mos2/mos2init.c
+++ b/src/spicelib/devices/mos2/mos2init.c
@@ -73,7 +73,7 @@ SPICEdev MOS2info = {
 #endif    
  /* DEVinstSize   */ &MOS2iSize,
  /* DEVmodSize    */ &MOS2mSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   MOS2bindCSC,
  /* DEVbindCSCComplex */   MOS2bindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/mos3/Makefile.am b/src/spicelib/devices/mos3/Makefile.am
index 251e3f5d6..08fbc33b9 100644
--- a/src/spicelib/devices/mos3/Makefile.am
+++ b/src/spicelib/devices/mos3/Makefile.am
@@ -38,6 +38,11 @@ if KLU_WANTED
 libmos3_la_SOURCES += mos3bindCSC.c
 endif
 
+if SuperLU_WANTED
+libmos3_la_SOURCES += mos3bindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mos3/mos3ext.h b/src/spicelib/devices/mos3/mos3ext.h
index 248d8d8e3..c14940a4b 100644
--- a/src/spicelib/devices/mos3/mos3ext.h
+++ b/src/spicelib/devices/mos3/mos3ext.h
@@ -29,7 +29,7 @@ extern int MOS3disto(int,GENmodel*,CKTcircuit*);
 extern int MOS3noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 extern int MOS3dSetup(GENmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int MOS3bindCSC(GENmodel*, CKTcircuit*);
 extern int MOS3bindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/mos3/mos3init.c b/src/spicelib/devices/mos3/mos3init.c
index bac4d8869..a986b41b2 100644
--- a/src/spicelib/devices/mos3/mos3init.c
+++ b/src/spicelib/devices/mos3/mos3init.c
@@ -73,7 +73,7 @@ SPICEdev MOS3info = {
 #endif                         
  /* DEVinstSize   */ &MOS3iSize,
  /* DEVmodSize    */ &MOS3mSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   MOS3bindCSC,
  /* DEVbindCSCComplex */   MOS3bindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/mos6/Makefile.am b/src/spicelib/devices/mos6/Makefile.am
index 6e685d129..6cf3dbfb9 100644
--- a/src/spicelib/devices/mos6/Makefile.am
+++ b/src/spicelib/devices/mos6/Makefile.am
@@ -26,6 +26,11 @@ if KLU_WANTED
 libmos6_la_SOURCES += mos6bindCSC.c
 endif
 
+if SuperLU_WANTED
+libmos6_la_SOURCES += mos6bindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mos6/mos6ext.h b/src/spicelib/devices/mos6/mos6ext.h
index 8fdaf8a42..67ff3b5ba 100644
--- a/src/spicelib/devices/mos6/mos6ext.h
+++ b/src/spicelib/devices/mos6/mos6ext.h
@@ -20,7 +20,7 @@ extern int MOS6temp(GENmodel*,CKTcircuit*);
 extern int MOS6trunc(GENmodel*,CKTcircuit*,double*);
 extern int MOS6convTest(GENmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int MOS6bindCSC(GENmodel*, CKTcircuit*);
 extern int MOS6bindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/mos6/mos6init.c b/src/spicelib/devices/mos6/mos6init.c
index 40987971a..d96e892ea 100644
--- a/src/spicelib/devices/mos6/mos6init.c
+++ b/src/spicelib/devices/mos6/mos6init.c
@@ -73,7 +73,7 @@ SPICEdev MOS6info = {
 #endif                        
  /* DEVinstSize   */ &MOS6iSize,
  /* DEVmodSize    */ &MOS6mSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   MOS6bindCSC,
  /* DEVbindCSCComplex */   MOS6bindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/mos9/Makefile.am b/src/spicelib/devices/mos9/Makefile.am
index 75afaaa26..19838c973 100644
--- a/src/spicelib/devices/mos9/Makefile.am
+++ b/src/spicelib/devices/mos9/Makefile.am
@@ -38,6 +38,11 @@ if KLU_WANTED
 libmos9_la_SOURCES += mos9bindCSC.c
 endif
 
+if SuperLU_WANTED
+libmos9_la_SOURCES += mos9bindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mos9/mos9ext.h b/src/spicelib/devices/mos9/mos9ext.h
index 63cf1a53d..2ebbf3a68 100644
--- a/src/spicelib/devices/mos9/mos9ext.h
+++ b/src/spicelib/devices/mos9/mos9ext.h
@@ -29,7 +29,7 @@ extern int MOS9disto(int,GENmodel*,CKTcircuit*);
 extern int MOS9noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 extern int MOS9dSetup(GENmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int MOS9bindCSC(GENmodel*, CKTcircuit*);
 extern int MOS9bindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/mos9/mos9init.c b/src/spicelib/devices/mos9/mos9init.c
index 39c8edf19..920958829 100644
--- a/src/spicelib/devices/mos9/mos9init.c
+++ b/src/spicelib/devices/mos9/mos9init.c
@@ -73,7 +73,7 @@ SPICEdev MOS9info = {
 #endif                        
  /* DEVinstSize   */ &MOS9iSize,
  /* DEVmodSize    */ &MOS9mSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   MOS9bindCSC,
  /* DEVbindCSCComplex */   MOS9bindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/res/Makefile.am b/src/spicelib/devices/res/Makefile.am
index 7e86e5c7e..2580d468e 100644
--- a/src/spicelib/devices/res/Makefile.am
+++ b/src/spicelib/devices/res/Makefile.am
@@ -31,6 +31,11 @@ if KLU_WANTED
 libres_la_SOURCES += resbindCSC.c
 endif
 
+if SuperLU_WANTED
+libres_la_SOURCES += resbindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/res/resext.h b/src/spicelib/devices/res/resext.h
index 94806b6d6..188fd6381 100644
--- a/src/spicelib/devices/res/resext.h
+++ b/src/spicelib/devices/res/resext.h
@@ -21,7 +21,7 @@ extern int RESsetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
 extern int REStemp(GENmodel*,CKTcircuit*);
 extern int RESnoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int RESbindCSC(GENmodel*, CKTcircuit*);
 extern int RESbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/res/resinit.c b/src/spicelib/devices/res/resinit.c
index 214d760ba..3183af020 100644
--- a/src/spicelib/devices/res/resinit.c
+++ b/src/spicelib/devices/res/resinit.c
@@ -73,7 +73,7 @@ SPICEdev RESinfo = {
 #endif                        
  /* DEVinstSize   */ &RESiSize,
  /* DEVmodSize    */ &RESmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   RESbindCSC,
  /* DEVbindCSCComplex */   RESbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/soi3/Makefile.am b/src/spicelib/devices/soi3/Makefile.am
index 01dfcf9cd..486aab49e 100644
--- a/src/spicelib/devices/soi3/Makefile.am
+++ b/src/spicelib/devices/soi3/Makefile.am
@@ -31,6 +31,11 @@ if KLU_WANTED
 libsoi3_la_SOURCES += soi3bindCSC.c
 endif
 
+if SuperLU_WANTED
+libsoi3_la_SOURCES += soi3bindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/soi3/soi3ext.h b/src/spicelib/devices/soi3/soi3ext.h
index 17eff2e2b..e9ef8fd31 100644
--- a/src/spicelib/devices/soi3/soi3ext.h
+++ b/src/spicelib/devices/soi3/soi3ext.h
@@ -66,7 +66,7 @@ extern int SOI3convTest(GENmodel*,CKTcircuit*);
 /* extern int SOI3disto(int,GENmodel*,CKTcircuit*); */
 extern int SOI3noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int SOI3bindCSC(GENmodel*, CKTcircuit*);
 extern int SOI3bindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/soi3/soi3init.c b/src/spicelib/devices/soi3/soi3init.c
index 654642bb3..6725acd69 100644
--- a/src/spicelib/devices/soi3/soi3init.c
+++ b/src/spicelib/devices/soi3/soi3init.c
@@ -73,7 +73,7 @@ SPICEdev SOI3info = {
 #endif                        
  /* DEVinstSize   */ &SOI3iSize,
  /* DEVmodSize    */ &SOI3mSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   SOI3bindCSC,
  /* DEVbindCSCComplex */   SOI3bindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/sw/Makefile.am b/src/spicelib/devices/sw/Makefile.am
index 077053cc1..f7277027d 100644
--- a/src/spicelib/devices/sw/Makefile.am
+++ b/src/spicelib/devices/sw/Makefile.am
@@ -28,6 +28,11 @@ if KLU_WANTED
 libsw_la_SOURCES += swbindCSC.c
 endif
 
+if SuperLU_WANTED
+libsw_la_SOURCES += swbindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/sw/swext.h b/src/spicelib/devices/sw/swext.h
index 0447ac31e..b8b38d55c 100644
--- a/src/spicelib/devices/sw/swext.h
+++ b/src/spicelib/devices/sw/swext.h
@@ -18,7 +18,7 @@ extern int SWsetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
 extern int SWnoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 extern int SWtrunc(GENmodel*,CKTcircuit*,double*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int SWbindCSC(GENmodel*, CKTcircuit*);
 extern int SWbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/sw/swinit.c b/src/spicelib/devices/sw/swinit.c
index 23c8f8bc1..9d2350acb 100644
--- a/src/spicelib/devices/sw/swinit.c
+++ b/src/spicelib/devices/sw/swinit.c
@@ -74,7 +74,7 @@ SPICEdev SWinfo = {
 #endif /* CIDER */                        
  /* DEVinstSize   */ &SWiSize,
  /* DEVmodSize    */ &SWmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   SWbindCSC,
  /* DEVbindCSCComplex */   SWbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/tra/Makefile.am b/src/spicelib/devices/tra/Makefile.am
index 17576a55f..ffc2640c1 100644
--- a/src/spicelib/devices/tra/Makefile.am
+++ b/src/spicelib/devices/tra/Makefile.am
@@ -26,6 +26,11 @@ if KLU_WANTED
 libtra_la_SOURCES += trabindCSC.c
 endif
 
+if SuperLU_WANTED
+libtra_la_SOURCES += trabindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/tra/traext.h b/src/spicelib/devices/tra/traext.h
index bfa5ac9d0..0138ad32a 100644
--- a/src/spicelib/devices/tra/traext.h
+++ b/src/spicelib/devices/tra/traext.h
@@ -17,7 +17,7 @@ extern int TRAunsetup(GENmodel*,CKTcircuit*);
 extern int TRAtemp(GENmodel*,CKTcircuit*);
 extern int TRAtrunc(GENmodel*,CKTcircuit*,double*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int TRAbindCSC(GENmodel*, CKTcircuit*);
 extern int TRAbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/tra/trainit.c b/src/spicelib/devices/tra/trainit.c
index 1647f10dc..af81214e2 100644
--- a/src/spicelib/devices/tra/trainit.c
+++ b/src/spicelib/devices/tra/trainit.c
@@ -73,7 +73,7 @@ SPICEdev TRAinfo = {
 #endif                        
  /* DEVinstSize   */ &TRAiSize,
  /* DEVmodSize    */ &TRAmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   TRAbindCSC,
  /* DEVbindCSCComplex */   TRAbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/txl/Makefile.am b/src/spicelib/devices/txl/Makefile.am
index 25e7c4d9a..2d827ec29 100644
--- a/src/spicelib/devices/txl/Makefile.am
+++ b/src/spicelib/devices/txl/Makefile.am
@@ -26,6 +26,10 @@ if KLU_WANTED
 libtxl_la_SOURCES += txlbindCSC.c
 endif
 
+if SuperLU_WANTED
+libtxl_la_SOURCES += txlbindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
 
diff --git a/src/spicelib/devices/txl/txlext.h b/src/spicelib/devices/txl/txlext.h
index b5271cee0..6b68bf7e2 100644
--- a/src/spicelib/devices/txl/txlext.h
+++ b/src/spicelib/devices/txl/txlext.h
@@ -13,7 +13,7 @@ extern int TXLparam(int,IFvalue*,GENinstance*,IFvalue*);
 extern int TXLsetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
 extern int TXLunsetup(GENmodel*, CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int TXLbindCSC(GENmodel*, CKTcircuit*);
 extern int TXLbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/txl/txlinit.c b/src/spicelib/devices/txl/txlinit.c
index 2922eb7a9..c9e2d9591 100644
--- a/src/spicelib/devices/txl/txlinit.c
+++ b/src/spicelib/devices/txl/txlinit.c
@@ -78,7 +78,7 @@ SPICEdev TXLinfo = {
 #endif
     &TXLiSize,
     &TXLmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   TXLbindCSC,
  /* DEVbindCSCComplex */   TXLbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/urc/urcinit.c b/src/spicelib/devices/urc/urcinit.c
index 9d526dc90..2e9db6fc2 100644
--- a/src/spicelib/devices/urc/urcinit.c
+++ b/src/spicelib/devices/urc/urcinit.c
@@ -73,7 +73,7 @@ SPICEdev URCinfo = {
 #endif                        
  /* DEVinstSize   */ &URCiSize,
  /* DEVmodSize    */ &URCmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   NULL,
  /* DEVbindCSCComplex */   NULL,
 #endif
diff --git a/src/spicelib/devices/vbic/Makefile.am b/src/spicelib/devices/vbic/Makefile.am
index 0e00a7037..7154f5147 100644
--- a/src/spicelib/devices/vbic/Makefile.am
+++ b/src/spicelib/devices/vbic/Makefile.am
@@ -31,6 +31,10 @@ if KLU_WANTED
 libvbic_la_SOURCES += vbicbindCSC.c
 endif
 
+if SuperLU_WANTED
+libvbic_la_SOURCES += vbicbindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
 
diff --git a/src/spicelib/devices/vbic/vbicext.h b/src/spicelib/devices/vbic/vbicext.h
index a2e40a156..de157cc8c 100644
--- a/src/spicelib/devices/vbic/vbicext.h
+++ b/src/spicelib/devices/vbic/vbicext.h
@@ -28,7 +28,7 @@ extern int VBICnoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 
 #endif
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int VBICbindCSC(GENmodel*, CKTcircuit*);
 extern int VBICbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/vbic/vbicinit.c b/src/spicelib/devices/vbic/vbicinit.c
index 9a8af362e..de1391ee5 100644
--- a/src/spicelib/devices/vbic/vbicinit.c
+++ b/src/spicelib/devices/vbic/vbicinit.c
@@ -78,7 +78,7 @@ SPICEdev VBICinfo = {
 #endif                                                         
     &VBICiSize,   /* DEVinstSize    */
     &VBICmSize,   /* DEVmodSize     */
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   VBICbindCSC,
  /* DEVbindCSCComplex */   VBICbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/vccs/Makefile.am b/src/spicelib/devices/vccs/Makefile.am
index 33fd0c432..84bfe6303 100644
--- a/src/spicelib/devices/vccs/Makefile.am
+++ b/src/spicelib/devices/vccs/Makefile.am
@@ -27,6 +27,11 @@ if KLU_WANTED
 libvccs_la_SOURCES += vccsbindCSC.c
 endif
 
+if SuperLU_WANTED
+libvccs_la_SOURCES += vccsbindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/vccs/vccsext.h b/src/spicelib/devices/vccs/vccsext.h
index 234c5a34e..8029f6a3c 100644
--- a/src/spicelib/devices/vccs/vccsext.h
+++ b/src/spicelib/devices/vccs/vccsext.h
@@ -16,7 +16,7 @@ extern int VCCSsSetup(SENstruct*,GENmodel*);
 extern void VCCSsPrint(GENmodel*,CKTcircuit*);
 extern int VCCSsetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int VCCSbindCSC(GENmodel*, CKTcircuit*);
 extern int VCCSbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/vccs/vccsinit.c b/src/spicelib/devices/vccs/vccsinit.c
index 0ceaa9c67..b8fd47618 100644
--- a/src/spicelib/devices/vccs/vccsinit.c
+++ b/src/spicelib/devices/vccs/vccsinit.c
@@ -73,7 +73,7 @@ SPICEdev VCCSinfo = {
 #endif                        
  /* DEVinstSize   */ &VCCSiSize,
  /* DEVmodSize    */ &VCCSmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   VCCSbindCSC,
  /* DEVbindCSCComplex */   VCCSbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/vcvs/Makefile.am b/src/spicelib/devices/vcvs/Makefile.am
index 8d87dd48d..99cdf2243 100644
--- a/src/spicelib/devices/vcvs/Makefile.am
+++ b/src/spicelib/devices/vcvs/Makefile.am
@@ -28,6 +28,11 @@ if KLU_WANTED
 libvcvs_la_SOURCES += vcvsbindCSC.c
 endif
 
+if SuperLU_WANTED
+libvcvs_la_SOURCES += vcvsbindCSC.c
+endif
+
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/vcvs/vcvsext.h b/src/spicelib/devices/vcvs/vcvsext.h
index 0c984b74e..603a8e898 100644
--- a/src/spicelib/devices/vcvs/vcvsext.h
+++ b/src/spicelib/devices/vcvs/vcvsext.h
@@ -18,7 +18,7 @@ extern void VCVSsPrint(GENmodel*,CKTcircuit*);
 extern int VCVSsetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
 extern int VCVSunsetup(GENmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int VCVSbindCSC(GENmodel*, CKTcircuit*);
 extern int VCVSbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/vcvs/vcvsinit.c b/src/spicelib/devices/vcvs/vcvsinit.c
index 65ef1fb1a..492b19006 100644
--- a/src/spicelib/devices/vcvs/vcvsinit.c
+++ b/src/spicelib/devices/vcvs/vcvsinit.c
@@ -73,7 +73,7 @@ SPICEdev VCVSinfo = {
 #endif                          
  /* DEVinstSize   */ &VCVSiSize,
  /* DEVmodSize    */ &VCVSmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindCSC        */   VCVSbindCSC,
  /* DEVbindCSCComplex */   VCVSbindCSCComplex,
 #endif
diff --git a/src/spicelib/devices/vsrc/Makefile.am b/src/spicelib/devices/vsrc/Makefile.am
index 0c27cda4e..6edde9af4 100644
--- a/src/spicelib/devices/vsrc/Makefile.am
+++ b/src/spicelib/devices/vsrc/Makefile.am
@@ -27,6 +27,9 @@ if KLU_WANTED
 libvsrc_la_SOURCES += vsrcbindCSC.c
 endif
 
+if SuperLU_WANTED
+libvsrc_la_SOURCES += vsrcbindCSC.c
+endif
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 AM_CFLAGS = $(STATIC)
diff --git a/src/spicelib/devices/vsrc/vsrcext.h b/src/spicelib/devices/vsrc/vsrcext.h
index 5ea505deb..a22efd079 100644
--- a/src/spicelib/devices/vsrc/vsrcext.h
+++ b/src/spicelib/devices/vsrc/vsrcext.h
@@ -19,7 +19,7 @@ extern int VSRCunsetup(GENmodel*,CKTcircuit*);
 extern int VSRCpzSetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
 extern int VSRCtemp(GENmodel*,CKTcircuit*);
 
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
 extern int VSRCbindCSC(GENmodel*, CKTcircuit*);
 extern int VSRCbindCSCComplex(GENmodel*, CKTcircuit*);
 #endif
diff --git a/src/spicelib/devices/vsrc/vsrcinit.c b/src/spicelib/devices/vsrc/vsrcinit.c
index c94e437d7..38874ae6c 100644
--- a/src/spicelib/devices/vsrc/vsrcinit.c
+++ b/src/spicelib/devices/vsrc/vsrcinit.c
@@ -73,7 +73,7 @@ SPICEdev VSRCinfo = {
 #endif                        
  /* DEVinstSize   */ &VSRCiSize,
  /* DEVmodSize    */ &VSRCmSize,
-#ifdef KLU
+#if defined(KLU) || defined(SuperLU)
  /* DEVbindklu        */ VSRCbindCSC,
  /* DEVbindkluComplex */ VSRCbindCSCComplex,
 #endif