diff --git a/ChangeLog b/ChangeLog
index f17a9045d..5806ee587 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-20  Robert Larice
+ * configure.ac ,
+ * src/Makefile.am :
+   #3/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
 2011-08-20  Robert Larice
  * src/include/* :
    #2/7 use a subdirectory "ngspice" for includes to create a uniq namespace
diff --git a/configure.ac b/configure.ac
index 3361cfa35..ef03ca3c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1070,7 +1070,7 @@ AC_CONFIG_FILES([Makefile
                  src/frontend/plotting/Makefile
                  src/frontend/trannoise/Makefile
                  src/frontend/wdisp/Makefile
-                 src/include/Makefile
+                 src/include/ngspice/Makefile
                  src/maths/Makefile
                  src/maths/cmaths/Makefile
                  src/maths/fft/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 6c4cb325b..0e667fc27 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 # $Id$
 
-SUBDIRS = misc maths frontend spicelib include
-DIST_SUBDIRS = misc maths frontend spicelib include xspice ciderlib
+SUBDIRS = misc maths frontend spicelib include/ngspice
+DIST_SUBDIRS = misc maths frontend spicelib include/ngspice xspice ciderlib
 
 if XSPICE_WANTED
 SUBDIRS += xspice