diff --git a/ChangeLog b/ChangeLog
index d6f491aa5..4ee5f878c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2007-04-30 Gong Ding <gdiso@ustc.edu>
+  
+  Add NDEV (numerical device) to device library. It is an interface 
+  to call my 2d semiconductor simulation code via network. 
+  The device simulation code can be found at http://gss-tcad.sourceforge.net
+ 
+ *     src/spicelib/device/ndev/*.*   : The NDEV implement code  
+ *     src/spicelib/device/dev.c      : Add ndev to spice device library
+ *     src/spicelib/parser/inppas2.c  : Add element name 'N' to describe NDEV  
+ *     src/spicelib/parser/inp2n.c    : Routine to parse NDEV element
+ *     src/spicelib/parser/inpdomod.c : Routine to parse NDEV model
+ *     src/frontend/misccoms.c        : When quit, call CKTdestroy function
+ *     src/spicelib/analysis/dctran.c : Show a time process indicator
+ *     src/ciderlib/oned/onedest.c    : Fix a invalid memory read problem
+ *     src/frontend/terminal.c        : change <termcap.h> to <ncurses/termcap.h> 
+  
 2007-04-26 Paolo Nenzi <p.nenzi@ieee.org>
 
 *     src/spicelib/devices/dsim4/: updated bsim4 model to 4.6.0.
diff --git a/INSTALL b/INSTALL
index 72c4f07df..f5b87dba0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -127,7 +127,13 @@ Options Specific to Using NGSpice
 --enable-cider
 		Enable CIDER enhancements, (experimental)
 		A mixed level simulator built upon spice3.
-		
+
+--enable-ndev
+		Enable NDEV interface, (experimental)
+		A TCP/IP interface to external device simulator such as GSS.
+		For more information, please visit the homepage of GSS at 
+		http://gss-tcad.sourceforge.net
+
 --enable-cluster
 		Enable cluster support, (experimental)
 		
diff --git a/configure.in b/configure.in
index 66902b033..9b019da4a 100644
--- a/configure.in
+++ b/configure.in
@@ -146,6 +146,10 @@ dnl --enable-adms: define ADMS in the code. This is for the adms Verilog-A compi
 AC_ARG_ENABLE(adms,
     AS_HELP_STRING([--enable-adms],[Enable ADMS code models, (experimental) ]))
 
+dnl --enable-ndev: define NDEV in the code. An interface for external device i.e. numerical device
+AC_ARG_ENABLE(ndev,
+    AS_HELP_STRING([--enable-ndev],[Enable NDEV interface, (experimental) ]))
+
 dnl --enable-cluster: define CLUSTER in the code. This is for cluster support
 AC_ARG_ENABLE(cluster,
     AS_HELP_STRING([--enable-cluster],[Enable cluster support, (experimental) ]))
@@ -683,20 +687,33 @@ if test "$enable_adms" = "yes"; then
    
    VLADEVDIR=" adms/hicum0 \
                adms/hicum2 \
-               adms/mextram \
-               adms/psp102 "
+               adms/mextram "
 
    VLADEV=" spicelib/devices/adms/hicum0/libhicum0.a \
             spicelib/devices/adms/hicum2/libhicum2.a \      
-            spicelib/devices/adms/mextram/libmextram.a \       
-            spicelib/devices/adms/psp102/libpsp102.a "       
+            spicelib/devices/adms/mextram/libmextram.a "       
     
 fi   
 AC_SUBST(ADMSXML)
 AC_SUBST(VLADEVDIR)
 AC_SUBST(VLADEV)
 
+dnl NDEV option
+if test "$enable_ndev" = "yes"; then
+     AC_MSG_RESULT(NDEV features enabled)
+     AC_DEFINE(NDEV,[],[The NDEV interface])
+     NDEV="" 
+     NDEV_DIR=" ndev "
+     NDEV_LIB=" spicelib/devices/ndev/libndev.a "
+else
+     NDEV=""
+     NDEV_DIR="" 
+     NDEV_LIB=""   
+fi
+AC_SUBST(NDEV_DIR)
+AC_SUBST(NDEV_LIB)
 
+     
 dnl Cluster option
 if test "$enable_cluster" = "yes"; then
    AC_MSG_RESULT(Cluster version is being compiled)
@@ -815,6 +832,7 @@ src/spicelib/devices/mos2/Makefile	\
 src/spicelib/devices/mos3/Makefile	\
 src/spicelib/devices/mos6/Makefile	\
 src/spicelib/devices/mos9/Makefile	\
+src/spicelib/devices/ndev/Makefile	\
 src/spicelib/devices/res/Makefile	\
 src/spicelib/devices/soi3/Makefile	\
 src/spicelib/devices/sw/Makefile	\
diff --git a/src/Makefile.am b/src/Makefile.am
index 30104109a..d036549c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -70,6 +70,7 @@ DYNAMIC_DEVICELIBS = 					\
 	spicelib/devices/vccs/libvccs.a			\
 	spicelib/devices/vcvs/libvcvs.a			\
 	spicelib/devices/vsrc/libvsrc.a			\
+	@NDEV_LIB@					\
 	@VLADEV@		\
 	@NUMDEV@