diff --git a/cde/configure.ac b/cde/configure.ac
index 6ef65dc5b..39dd54f7c 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -398,6 +398,8 @@ programs/dtexec/Makefile
 
 programs/dtdbcache/Makefile
 
+programs/dticon/Makefile
+
 ])
 
 AC_OUTPUT
diff --git a/cde/programs/dticon/Makefile.am b/cde/programs/dticon/Makefile.am
index eceb6cdef..f316ad73f 100644
--- a/cde/programs/dticon/Makefile.am
+++ b/cde/programs/dticon/Makefile.am
@@ -4,23 +4,14 @@ bin_PROGRAMS = dticon
 
 dticon_CFLAGS = -D__TOOLTALK $(TIRPCINC)
 
-if SOLARIS
-LIBHELP =
-endif
-
-dticon_LDADD = ${X_LIBS} -lm $(LIBHELP) $(LIBWIDGET) $(LIBSVC) $(LIBTT) \
-	       $(XTOOLLIB) -lXm
+dticon_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
 
 if SOLARIS
 dticon_LDADD += -ldl
 endif
 
-if AIX
-dticon_LDADD += -liconv
-endif
-
-dticon_SOURCES = dtIconShell.c   event.c         fileIO.c \
-                 fileIODialog.c  globals.c       graphics.c \
-                 help.c          image.c         main.c \
-                 newIconDialog.c process.c       queryDialog.c \
-                 stdErrDialog.c  utils.c
+dticon_SOURCES = dtIconShell.c event.c fileIO.c fileIODialog.c	\
+                 globals.c graphics.c help.c image.c main.c	\
+                 newIconDialog.c process.c queryDialog.c	\
+                 stdErrDialog.c utils.c constants.h externals.h	\
+                 help.h main.h