diff --git a/cde/configure.ac b/cde/configure.ac
index b80fe18c0..f8084b591 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -402,6 +402,8 @@ programs/dticon/Makefile
 
 programs/dtterm/Makefile
 
+programs/dtcalc/Makefile
+
 ])
 
 AC_OUTPUT
diff --git a/cde/programs/dtcalc/Makefile.am b/cde/programs/dtcalc/Makefile.am
index 19f837d35..7dfd6f507 100644
--- a/cde/programs/dtcalc/Makefile.am
+++ b/cde/programs/dtcalc/Makefile.am
@@ -1,19 +1,17 @@
+MAINTAINERCLEANFILES = Makefile.in
+
 bin_PROGRAMS = dtcalc
 
-dtcalc_CPPFLAGS = -DCDE_INSTALLATION_TOP=${prefix}
+dtcalc_CPPFLAGS = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\"
 
-dtcalc_LDADD = ${X_LIBS} -lm $(TTLIB) $(LIBSVC) $(LIBHELP)
-
-if AIX
-dtcalc_LDADD += -lmsaa -liconv
-endif
+dtcalc_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
 
 if SOLARIS
 dtcalc_LDADD += -lintl -ldl
 endif
 
 
-dtcalc_SOURCES = calctool.c      ds_common.c     ds_popup.c \
-		 ds_widget.c     ds_xlib.c       functions.c \
-		 help.c          motif.c         mp.c \
-		 text.c
+dtcalc_SOURCES = calctool.c ds_common.c ds_popup.c ds_widget.c		\
+		 ds_xlib.c functions.c help.c motif.c mp.c text.c	\
+		 calctool.h ds_popup.h ds_xlib.h patchlevel.h		\
+		 ds_common.h ds_widget.h motif.h