diff --git a/ChangeLog b/ChangeLog
index d55469e86..20c870a2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
 2004-01-10  Paolo Nenzi <p.nenzi@ieee.org>
 
+	*   configure.in 
+	    src/xspice/cmpp/Makefile src/xspice/cmpp/Makefile.in:
+	    Make configure automatically set paths for lex yacc and 
+	    install dir (Stefan Jones <stefan.jones@multigig.com>).
+
 	*  src/Makefile.am Makefile.am README.Tcl
 	   src/xspice/README src/xspice/icm/README
 	   src/xspice/icm/spice2poly/icm_spice2poly/README:
 	   Updated to reflect codemodel support is now complete
-	   (Stefan Jones <stefan.jones@multigig.com>)
+	   (Stefan Jones <stefan.jones@multigig.com>).
 
 	*  src/xspice/ipc/ipc.c:
 	   Remove linux specific includes which are not needed
diff --git a/configure.in b/configure.in
index cfbe1de43..05be16cc0 100644
--- a/configure.in
+++ b/configure.in
@@ -392,7 +392,7 @@ if test "$enable_ekv" = "yes"; then
     AC_MSG_RESULT(Model EKV included)
     AC_DEFINE(HAVE_EKV)
     EKVDIR="ekv"
-    EKVLIB="spicelib/devices/ekv/libekv.a"
+    EKVLIB="spicelib/devices/ekv/libekv.la"
 else
     EKVDIR=""
     EKVLIB=""	
@@ -405,10 +405,11 @@ dnl Add new code models to the build by pointing to them here.
 if test "$enable_xspice" = "yes"; then
     AC_MSG_RESULT(X-Spice features included)
     AC_DEFINE(XSPICE)
+    AC_PROG_YACC
+    AM_PROG_LEX
     XSPICEDIR="xspice"
-    XSPICELIB1="$XSPICEDIR/xspice.o        \
-		$XSPICEDIR/mif/libmifxsp.a \
-	        $XSPICEDIR/cm/libcmxsp.a"
+    XSPICELIB1="$XSPICEDIR/cm/libcmxsp.a \
+    		$XSPICEDIR/mif/libmifxsp.a"
     XSPICELIB2="$XSPICEDIR/evt/libevtxsp.a \
                 $XSPICEDIR/enh/libenhxsp.a \
 	        $XSPICEDIR/ipc/libipcxsp.a \
@@ -587,6 +588,7 @@ src/maths/sparse/Makefile	\
 src/misc/Makefile		\
 src/xspice/Makefile		\
 src/xspice/cm/Makefile		\
+src/xspice/cmpp/Makefile	\
 src/xspice/icm/makedefs		\
 src/xspice/mif/Makefile		\
 src/xspice/evt/Makefile		\
diff --git a/src/xspice/cmpp/Makefile.in b/src/xspice/cmpp/Makefile.in
new file mode 100755
index 000000000..9d8a6ed2a
--- /dev/null
+++ b/src/xspice/cmpp/Makefile.in
@@ -0,0 +1,36 @@
+
+cmpp_OBJS = main.o  pp_ifs.o  pp_lst.o  pp_mod.o  \
+	read_ifs.o  util.o  writ_ifs.o \
+	ifs_yacc.o ifs_lex.o mod_yacc.o mod_lex.o
+
+cmpp_GEN = ifs_yacc.c ifs_tok.h \
+	ifs_lex.c ifs_lex.h \
+	mod_lex.c mod_lex.h \
+	mod_yacc.c 	mod_tok.h
+
+YACC = @YACC@ -d
+
+CC = @CC@ @CFLAGS@
+
+LEX = @LEX@ -t
+
+all: cmpp
+
+cmpp: $(cmpp_OBJS)
+	$(CC) -o cmpp $(cmpp_OBJS)
+
+%.c : %.y
+	$(YACC) -p $(*:yacc=)yy $<
+	mv -f y.tab.c $*.c
+	mv -f y.tab.h $(*:yacc=)tok.h
+
+%.c : %.l
+	$(LEX) -P$(*:lex=)yy $< > $@
+	
+ifs_lex.c : ifs_lex.l
+	$(LEX) -i -P$(*:lex=)yy $< > $@
+
+install:
+
+clean:
+	rm -f $(cmpp_OBJS) $(cmpp_GEN) cmpp