diff --git a/src/include/ngspice/Makefile.am b/src/include/ngspice/Makefile.am
index 2b7cd023e..5b6af544c 100644
--- a/src/include/ngspice/Makefile.am
+++ b/src/include/ngspice/Makefile.am
@@ -1,8 +1,132 @@
 ## Process this file with automake to produce Makefile.in
 
-if SHARED_MODULE
+nodist_pkginclude_HEADERS = \
+	config.h
+
 pkginclude_HEADERS = \
-	sharedspice.h
-endif SHARED_MODULE
+	tclspice.h	\
+	acdefs.h	\
+	bdrydefs.h	\
+	bool.h		\
+	carddefs.h	\
+	ciderinp.h	\
+	cidersupt.h	\
+	cktdefs.h	\
+	cluster.h	\
+	cmconstants.h	\
+	cm.h		\
+	cmproto.h	\
+	cmtypes.h	\
+	compatmode.h	\
+	complex.h	\
+	const.h		\
+	contdefs.h	\
+	cpdefs.h	\
+	cpextern.h	\
+	cpstd.h		\
+	defines.h	\
+	devdefs.h	\
+	dgen.h		\
+	distodef.h	\
+	dllitf.h	\
+	domndefs.h	\
+	dopdefs.h	\
+	dstring.h	\
+	dvec.h		\
+	elctdefs.h	\
+	enh.h		\
+	enhtypes.h	\
+	evt.h		\
+	evtproto.h	\
+	evttypes.h	\
+	evtshared.h	\
+	evtudn.h	\
+	ftedbgra.h	\
+	ftedebug.h	\
+	ftedefs.h	\
+	fteoptdefs.h	\
+	ftedev.h	\
+	fteext.h	\
+	fteinp.h	\
+	fteinput.h	\
+	fteparse.h	\
+	gendefs.h	\
+	gendev.h	\
+	graph.h		\
+	grid.h		\
+	hash.h		\
+	hlpdefs.h	\
+	iferrmsg.h	\
+	ifsim.h		\
+	inpdefs.h	\
+	inpmacs.h	\
+	inpptree.h	\
+	ipc.h		\
+	ipcproto.h	\
+	ipctiein.h	\
+	jobdefs.h	\
+	lsort.h		\
+	macros.h	\
+	material.h	\
+	matldefs.h	\
+	memory.h	\
+	meshdefs.h	\
+	meshext.h	\
+	methdefs.h	\
+	mifcmdat.h	\
+	mifdefs.h	\
+	mif.h		\
+	mifparse.h	\
+	mifproto.h	\
+	miftypes.h	\
+	missing_math.h	\
+	mobdefs.h	\
+	modldefs.h	\
+	multi_line.h	\
+	ngspice.h	\
+	noisedef.h	\
+	numcards.h	\
+	numconst.h	\
+	numenum.h	\
+	numgen.h	\
+	numglobs.h	\
+	onedev.h	\
+	onemesh.h	\
+	opdefs.h	\
+	optdefs.h	\
+	optndefs.h	\
+	outpdefs.h	\
+	plot.h		\
+	pnode.h		\
+	profile.h	\
+	pssdefs.h	\
+	pzdefs.h	\
+	randnumb.h	\
+	sen2defs.h	\
+	sensdefs.h	\
+	sensgen.h	\
+	sharedspice.h	\
+	sim.h		\
+	smpdefs.h	\
+	sperror.h	\
+	spmatrix.h	\
+	stringskip.h	\
+	stringutil.h	\
+	suffix.h	\
+	swec.h		\
+	tfdefs.h	\
+	trandefs.h	\
+	trcvdefs.h	\
+	tskdefs.h	\
+	twodev.h	\
+	twomesh.h	\
+	typedefs.h	\
+	wordlist.h	\
+	1-f-code.h	\
+	FastNorm3.h	\
+	fftext.h	\
+	wallace.h	\
+	wincolornames.h	\
+	wstdio.h
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xspice/cmpp/Makefile.am b/src/xspice/cmpp/Makefile.am
index a3f394181..e155d4627 100644
--- a/src/xspice/cmpp/Makefile.am
+++ b/src/xspice/cmpp/Makefile.am
@@ -6,7 +6,7 @@ EXTRA_DIST = .gitignore
 
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_PROGRAMS = cmpp
+bin_PROGRAMS = cmpp
 
 AM_CPPFLAGS = -I. -I$(srcdir)
 AM_YFLAGS = -d
diff --git a/src/xspice/icm/GNUmakefile.in b/src/xspice/icm/GNUmakefile.in
index 662c4103f..3c28d1575 100644
--- a/src/xspice/icm/GNUmakefile.in
+++ b/src/xspice/icm/GNUmakefile.in
@@ -25,7 +25,7 @@ install: all
 		$(INSTALL_PROGRAM) $$cm/$$cm.cm "$(DESTDIR)$(pkglibdir)" \
 		|| exit 1; \
 	done
-#	$(INSTALL_DATA) $(srcdir)/dlmain.c "$(DESTDIR)$(pkgdatadir)" || exit $$?;
+	$(INSTALL_DATA) $(srcdir)/dlmain.c "$(DESTDIR)$(pkgdatadir)" || exit $$?;
 
 
 uninstall: