diff --git a/ChangeLog b/ChangeLog
index 91faf7406..bbcbd8acd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2011-12-29  Robert Larice
+ * src/include/ngspice/Makefile.am :
+  install headers in $(pkdatadir)/include/ngspice
+
+  use them with a single
+     -I $(pkdatadir)/include
+  compiler directive
+
+  This is for user compilation of
+    XSPICE and adms codemodels
+  outside of the ngspice build directory
+
+  Beware of the "ngspice/config.h" file
+
+  Especially if you build twice,
+    (for tclspice and then for ngspice)
+  both will install this file,
+    with different contents.
+
+  These headers are a mess,
+    yet they are at least isolated
+
+  The -I directive
+    will allow them to be found only
+    on explicit demand with a
+    "ngspice/" namespace seperator
+  (use 	#include "ngspice/...")
+
 2011-12-29  Robert Larice
  * src/Makefile.am :
   cleanup src/Makefile.am
diff --git a/src/include/ngspice/Makefile.am b/src/include/ngspice/Makefile.am
index 2a8a3341f..0c00ac65c 100644
--- a/src/include/ngspice/Makefile.am
+++ b/src/include/ngspice/Makefile.am
@@ -1,6 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_HEADERS =	\
+includedir = $(pkgdatadir)/include/ngspice
+
+nodist_include_HEADERS = \
+	config.h
+
+include_HEADERS = \
 	tclspice.h	\
 	acdefs.h	\
 	bdrydefs.h	\