diff --git a/configure.in b/configure.in
index 5aab9252c..abb105f91 100644
--- a/configure.in
+++ b/configure.in
@@ -413,7 +413,7 @@ if test "$enable_cider" = "yes"; then
      CIDERSIM="	$CIDERDIR/twod/libcidertwod.a     \
 		$CIDERDIR/oned/libcideroned.a     \
 		$CIDERDIR/input/libciderinput.a   \
-		$CIDERDIR/support/libcidersuprt.a \ "
+		$CIDERDIR/support/libcidersuprt.a"
      
      CIDERMATH="misc"
      
diff --git a/src/Makefile.am b/src/Makefile.am
index c412f3753..4fcbb5265 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,7 +29,7 @@ DYNAMIC_DEVICELIBS = 					\
 	spicelib/devices/bsim3v1a/libbsim3v1a.a		\
 	spicelib/devices/bsim4/libbsim4.a		\
 	spicelib/devices/cap/libcap.a			\
-	spicelib/devices/libbsim3soi.a			\
+	spicelib/devices/bsim3soi/libbsim3soi.a		\
 	spicelib/devices/bsim3soi_pd/libbsim3soipd.a	\
 	spicelib/devices/bsim3soi_fd/libbsim3soifd.a   	\
 	spicelib/devices/bsim3soi_dd/libbsim3soidd.a	\
@@ -87,12 +87,12 @@ ngspice_LDADD = \
 	spicelib/devices/libdev.a \
 	@XSPICELIB2@		  \
 	frontend/parser/libparser.a \
-	@CIDERSIM@
+	@CIDERSIM@		\
 	frontend/help/libhlp.a \
 	spicelib/parser/libinp.a \
 	maths/deriv/libderiv.a \
 	maths/cmaths/libcmaths.a \
-	@CIDERMATHDIR@
+	@CIDERMATHDIR@          \
 	maths/poly/libpoly.a \
 	maths/ni/libni.a \
 	maths/sparse/libsparse.a \