diff -wruN ../orig-Argyll_V1.3.5/profile/Makefile.am ./profile/Makefile.am
--- ../orig-Argyll_V1.3.5/profile/Makefile.am	2012-01-11 20:53:56.448041068 +0100
+++ ./profile/Makefile.am	2012-01-11 21:43:19.152803748 +0100
@@ -11,8 +11,8 @@
 	../numlib/libargyllnum.la ../spectro/libinsttypes.la	\
 	../xicc/libxutils.la ../libargyll.la
 
-LDADD = ./libprof.la ../xicc/libxutils.la ../spectro/libinst.la		\
-	../xicc/libxicc.la ../spectro/libinsttypes.la			\
+LDADD = ./libprof.la ../xicc/libxutils.la ../xicc/libxicc.la		\
+	../spectro/libinst.la ../spectro/libinsttypes.la		\
 	../gamut/libgamut.la ../gamut/libgammap.la ../plot/libvrml.la	\
 	../plot/libplot.la ../rspl/librspl.la				\
 	../numlib/libargyllnum.la $(ICC_LIBS) ../cgats/libcgats.la	\
diff -wruN ../orig-Argyll_V1.3.5/spectro/Makefile.am ./spectro/Makefile.am
--- ../orig-Argyll_V1.3.5/spectro/Makefile.am	2012-01-11 20:53:56.448041068 +0100
+++ ./spectro/Makefile.am	2012-01-11 21:51:16.265039580 +0100
@@ -10,6 +10,8 @@
 
 libinst_la_SOURCES = inst.h inst.c insttypes.c dtp20.c dtp20.h dtp22.c	\
 	dtp22.h dtp41.c dtp41.h dtp51.c dtp51.h dtp92.c dtp92.h		\
+	i1d3.c i1d3.h                                                   \
+	colorhug.c colorhug.h                                           \
 	i1disp.c i1disp.h i1pro.c i1pro.h i1pro_imp.c i1pro_imp.h	\
 	munki.c munki_imp.c ss.c ss.h ss_imp.c ss_imp.h hcfr.c hcfr.h	\
 	spyd2.c spyd2.h spyd2setup.h spyd2PLD.h huey.c huey.h unixio.c	\
@@ -33,7 +35,7 @@
 	../libargyllusb.la ../libargyll.la
 
 bin_PROGRAMS = synthcal dispwin dispread dispcal fakeread synthread	\
-	chartread spotread illumread ccmxmake spec2cie average spyd2en
+	chartread spotread illumread ccxxmake spec2cie average spyd2en
 
 dispwin_CFLAGS = $(AM_CFLAGS) -DSTANDALONE_TEST
 
diff -wruN ../orig-Argyll_V1.3.5/target/Makefile.am ./target/Makefile.am
--- ../orig-Argyll_V1.3.5/target/Makefile.am	2012-01-11 20:53:56.448041068 +0100
+++ ./target/Makefile.am	2012-01-11 21:19:48.114575843 +0100
@@ -11,6 +11,7 @@
 	$(ICC_LIBS) ../render/librender.la ../cgats/libcgats.la	\
 	../xicc/libxicc.la ../gamut/libgamut.la			\
 	../spectro/libinsttypes.la ../spectro/libconv.la	\
+	../spectro/libinst.la                                   \
 	../numlib/libargyllnum.la $(TIFF_LIBS)
 
 bin_PROGRAMS = targen printtarg
diff -wruN ../orig-Argyll_V1.3.5/xicc/Makefile.am ./xicc/Makefile.am
--- ../orig-Argyll_V1.3.5/xicc/Makefile.am	2012-01-11 20:53:56.448041068 +0100
+++ ./xicc/Makefile.am	2012-01-11 20:53:22.997984221 +0100
@@ -8,6 +8,7 @@
 libxicc_la_SOURCES = xicc.h xicc.c xlutfix.c xspect.c xspect.h xsep.c	\
 	xsep.h xdevlin.c xdevlin.h xcam.c xcam.h cam97s3.c cam97s3.h	\
 	cam02.c cam02.h mpp.c ccmx.c xfit.c xfit.h moncurve.c		\
+	ccss.h ccss.c                                                   \
 	moncurve.h mpp.h xdgb.c
 libxicc_la_LIBADD = $(ICC_LIBS) ../gamut/libgamut.la		\
 	../numlib/libargyllnum.la ../spectro/libinsttypes.la	\