diff --git a/ChangeLog b/ChangeLog
index f538a0a0b..0eedf4aa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-08-20 Stefan Jones <stefan.jones@multigig.com>
+
+	* src/frontend/parse.c:
+	Fix the bad free of pn_func in free_pnode
+
+	* src/Makefile.am:
+	Fixed libspice.so dependancies to avoid src/xspice.o
+	
 2003-08-01 Stefan Jones <stefan.jones@multigig.com>
 
 	* src/xspice/mif/mif_inp2.c:
diff --git a/src/Makefile.am b/src/Makefile.am
index 05eae5623..ba18a00b3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -213,7 +213,7 @@ install-tclspice: ${TCL_FILES}
 tclspice.o: tclspice.c
 	$(COMPILE) -c -fpic tclspice.c -DTCLSPICE_version="\"$(TCLSPICE_VERSION)\""
 
-libspice.so:  $(ngspice_OBJECTS) $(LIBSPICE_OBJS) $(ngspice_LDADD)
+libspice.so:  $(ngspice_OBJECTS) $(LIBSPICE_OBJS) $(ngspice_DEPENDENCIES)
 	$(LINK) $(ngspice_LDFLAGS) $(ngspice_OBJECTS) $(ngspice_LDADD) $(LIBS) $(LIBSPICE_OBJS) -shared -Wl,--version-script=tclspice.map
 	if test -f .libs/$@ ; then \
 	mv .libs/$@ ./ ;\
diff --git a/src/frontend/parse.c b/src/frontend/parse.c
index e59da1f44..b3299d815 100644
--- a/src/frontend/parse.c
+++ b/src/frontend/parse.c
@@ -865,14 +865,9 @@ free_pnode(struct pnode *t)
     free_pnode(t->pn_left);
     free_pnode(t->pn_right);
     free_pnode(t->pn_next);
-    tfree(t->pn_name); /* va: it is a copy() of original string, can be free'd */
-    /* va: tfree struct func, allocated within parser */
-    if (t->pn_func!=NULL) {
-    	tfree(t->pn_func->fu_name); /* va: name is a copy of original string */
-    	tfree(t->pn_func);    	    /* va: t->pn_func->fu_func must not tfree'd */
-    }
+    tfree(t->pn_name);
     if (t->pn_value)
-        vec_free(t->pn_value); /* patch by Stefan Jones */
+        vec_free(t->pn_value);
     tfree(t);
 }