diff --git a/configure.in b/configure.in
index 436a8c356..90d0ef7de 100644
--- a/configure.in
+++ b/configure.in
@@ -403,12 +403,18 @@ dnl Add CIDER enhacements to ngspice.
 if test "$enable_cider" = "yes"; then
      AC_MSG_RESULT(CIDER features enabled)
      AC_DEFINE(CIDER)
+     
      CIDERDIR="ciderlib"
+     
      CIDERSIM="	$CIDERDIR/twod/libcidertwod.a     \
 		$CIDERDIR/oned/libcideroned.a     \
 		$CIDERDIR/input/libciderinput.a   \
 		$CIDERDIR/support/libcidersuprt.a \ "
-            
+     
+     CIDERMATH="misc"
+     
+     CIDERMATHDIR="maths/misc/libmathmisc.a"
+     
      NUMDEV="	spicelib/devices/nbjt/libnbjt.a   \
 		spicelib/devices/nbjt2/libnbjt2.a \
 		spicelib/devices/numd/libnumd.a   \
@@ -425,6 +431,8 @@ CIDERSCRIPTS="devload devaxis ciderinit"
 else
    CIDERLIB=""
    CIDERSIM=""
+   CIDERMATH=""
+   CIDERMATHDIR=""
    NUMDEV=""
    NUMDEVDIR=""
    CIDERSCRIPTS=""
diff --git a/src/Makefile.am b/src/Makefile.am
index 5cbea62db..c412f3753 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -92,7 +92,7 @@ ngspice_LDADD = \
 	spicelib/parser/libinp.a \
 	maths/deriv/libderiv.a \
 	maths/cmaths/libcmaths.a \
-	maths/misc/libmathsmisc.a	\
+	@CIDERMATHDIR@
 	maths/poly/libpoly.a \
 	maths/ni/libni.a \
 	maths/sparse/libsparse.a \
diff --git a/src/maths/Makefile.am b/src/maths/Makefile.am
index 3b5c3aec2..659774aa4 100644
--- a/src/maths/Makefile.am
+++ b/src/maths/Makefile.am
@@ -1,4 +1,4 @@
 # Process this file with automake
 
-SUBDIRS = cmaths ni sparse poly deriv misc
+SUBDIRS = cmaths ni sparse poly deriv @CIDERMATH@
 MAINTAINERCLEANFILES = Makefile.in