diff --git a/src/Makefile.am b/src/Makefile.am
index 4b55a7aeb..4f0fb1508 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -547,6 +547,10 @@ libngspice_la_LIBADD += \
 	ciderlib/support/libcidersuprt.la
 endif
 
+if KLU_WANTED
+libngspice_la_LIBADD += maths/KLU/libKLU.la
+endif
+
 libngspice_la_LIBADD += \
 	maths/deriv/libderiv.la \
 	maths/cmaths/libcmaths.la \
diff --git a/src/maths/KLU/Makefile.am b/src/maths/KLU/Makefile.am
index b972ae12c..aebc62484 100644
--- a/src/maths/KLU/Makefile.am
+++ b/src/maths/KLU/Makefile.am
@@ -3,36 +3,13 @@
 noinst_LTLIBRARIES = libKLU_real.la libKLU_complex.la libKLU.la
 
 libKLU_real_la_SOURCES = 	\
-	amd_1.c			\
-	amd_2.c			\
-	amd_aat.c		\
-	amd_control.c		\
-	amd_defaults.c		\
-	amd_dump.c		\
-	amd_global.c		\
-	amd_info.c		\
-	amd_order.c		\
-	amd_postorder.c		\
-	amd_post_tree.c		\
-	amd_preprocess.c	\
-	amd_valid.c		\
-	btf_maxtrans.c		\
-	btf_order.c		\
-	btf_strongcomp.c	\
-	colamd.c		\
-	colamd_global.c		\
 	klu.c			\
-	klu_analyze.c		\
-	klu_analyze_given.c	\
-	klu_defaults.c		\
 	klu_diagnostics.c	\
 	klu_dump.c		\
 	klu_extract.c		\
 	klu_factor.c		\
 	klu_free_numeric.c 	\
-	klu_free_symbolic.c	\
 	klu_kernel.c		\
-	klu_memory.c		\
 	klu_refactor.c		\
 	klu_scale.c		\
 	klu_solve.c		\
@@ -44,6 +21,24 @@ libKLU_real_la_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
 
 
 libKLU_complex_la_SOURCES = 	\
+	klu.c			\
+	klu_diagnostics.c	\
+	klu_dump.c		\
+	klu_extract.c		\
+	klu_factor.c		\
+	klu_free_numeric.c 	\
+	klu_kernel.c		\
+	klu_refactor.c		\
+	klu_scale.c		\
+	klu_solve.c		\
+	klu_sort.c		\
+	klu_tsolve.c
+
+
+libKLU_complex_la_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -DCOMPLEX
+
+
+libKLU_la_SOURCES =		\
 	amd_1.c			\
 	amd_2.c			\
 	amd_aat.c		\
@@ -62,29 +57,11 @@ libKLU_complex_la_SOURCES = 	\
 	btf_strongcomp.c	\
 	colamd.c		\
 	colamd_global.c		\
-	klu.c			\
 	klu_analyze.c		\
 	klu_analyze_given.c	\
 	klu_defaults.c		\
-	klu_diagnostics.c	\
-	klu_dump.c		\
-	klu_extract.c		\
-	klu_factor.c		\
-	klu_free_numeric.c 	\
 	klu_free_symbolic.c	\
-	klu_kernel.c		\
 	klu_memory.c		\
-	klu_refactor.c		\
-	klu_scale.c		\
-	klu_solve.c		\
-	klu_sort.c		\
-	klu_tsolve.c
-
-
-libKLU_complex_la_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -DCOMPLEX
-
-
-libKLU_la_SOURCES =		\
 	klusmp.c
 
 libKLU_la_LIBADD =		\
@@ -93,5 +70,6 @@ libKLU_la_LIBADD =		\
 
 
 libKLU_la_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/maths/sparse/Makefile.am b/src/maths/sparse/Makefile.am
index 3ab29a6a4..b4e75e995 100644
--- a/src/maths/sparse/Makefile.am
+++ b/src/maths/sparse/Makefile.am
@@ -10,13 +10,14 @@ libsparse_la_SOURCES =	\
 	spextra.c	\
 	spfactor.c	\
 	spoutput.c	\
-	spsmp.c		\
 	spsolve.c	\
 	sputils.c
 
 
 if KLU_WANTED
 libsparse_la_SOURCES += spCSC.c
+else
+libsparse_la_SOURCES += spsmp.c
 endif
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include