diff --git a/.cvsignore b/.cvsignore
index 301a49eca..71cce1b9c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,14 +4,12 @@ ltconfig
 ltmain.sh
 aclocal.m4
 install-sh
-config.h.in
 mkinstalldirs
 missing
 stamp-h*
 Makefile.in
 configure
 config.log
-config.h
 config.cache
 libtool
 config.status
diff --git a/ChangeLog b/ChangeLog
index 5828eca38..b35e5549d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-27  Robert Larice
+ * configure.ac ,
+ * .cvsignore ,
+ * src/include/ngspice/.cvsignore :
+  #1/6 config.h --> ngspice/config.h,  configure.ac
+
 2011-12-27  Robert Larice
  * src/frontend/com_ghelp.c ,
  * src/frontend/cpitf.c :
diff --git a/configure.ac b/configure.ac
index 98b18e27d..d322af04c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,10 +26,12 @@ dnl Revison stamp the generated ./configure script
 AC_REVISION($Revision$)
 
 dnl Create a configuration header
-AC_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADER([src/include/ngspice/config.h])
 
 dnl Initialise automake stuff
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([-Wall -Werror nostdinc])
+
+AC_SUBST([AM_CPPFLAGS],['-I. -I$(srcdir) -I$(top_builddir)/src/include'])
 
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/src/include/ngspice/.cvsignore b/src/include/ngspice/.cvsignore
index 3dda72986..612c6cc7a 100644
--- a/src/include/ngspice/.cvsignore
+++ b/src/include/ngspice/.cvsignore
@@ -1,2 +1,4 @@
 Makefile.in
 Makefile
+config.h.in
+config.h