diff --git a/ChangeLog b/ChangeLog
index e3e2bc3c4..0b5994e9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-18  Arno W. Peters  <A.W.Peters@ieee.org>
+
+	* Makefile.am: Changes for notes dir -> NOTES file conversion.
+
+	* tests/Makefile.am: Make distcheck target work again.
+
 2000-10-17  Arno W. Peters  <A.W.Peters@ieee.org>
 
 	* TODO: Little updates.
diff --git a/Makefile.am b/Makefile.am
index 92d9ea14e..f168a3543 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 SUBDIRS = doc src man tests
 
-EXTRA_DIST = FAQ acconfig.h autogen.sh notes contrib 
+EXTRA_DIST = FAQ acconfig.h autogen.sh NOTES contrib 
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
 			config.h.in config.sub configure install-sh \
diff --git a/configure.in b/configure.in
index 8b25e7ac8..0253245e7 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,13 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/main.c)
+
 dnl Create a configuration header
 AM_CONFIG_HEADER(config.h)
 
+dnl Initialize automake stuff
+AM_INIT_AUTOMAKE(ng-spice-rework,12)
+
+
 dnl --enable-ansi : try to force --ansi option to the compiler
 AC_ARG_ENABLE(ansi,
     [  --enable-ansi           Force --ansi option for compilation])
@@ -36,9 +41,6 @@ AC_ARG_ENABLE(experimental,
     [  --enable-experimental   Enables some experimental code])
 
 
-dnl Initialize automake stuff
-AM_INIT_AUTOMAKE(ng-spice-rework,12)
-
 dnl Enable maintainer commands only if requested
 AM_MAINTAINER_MODE
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0336f6ac5..9b72796f0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,7 +6,7 @@ TESTS = \
 	diffpair.cir		\
 	fourbitadder.cir
 
-TESTS_ENVIRONMENT = $(SHELL) check.sh $(top_builddir)/src/ngspice
+TESTS_ENVIRONMENT = $(SHELL) $(srcdir)/check.sh $(top_builddir)/src/ngspice
 
 EXTRA_DIST = \
 	README			\