diff --git a/cf/Makefile.am.common b/cf/Makefile.am.common
index ce5538e1a..bcf094fa7 100644
--- a/cf/Makefile.am.common
+++ b/cf/Makefile.am.common
@@ -61,6 +61,8 @@ LIB_readline = @LIB_readline@
 
 LEXLIB = @LEXLIB@
 
+libexec_heimdaldir = $(libexecdir)/heimdal
+
 install-suid-programs:
 	@foo='$(bin_SUIDS)'; \
 	for file in $$foo; do \
diff --git a/lib/asn1/Makefile.am b/lib/asn1/Makefile.am
index c27bd3c4e..051b01d93 100644
--- a/lib/asn1/Makefile.am
+++ b/lib/asn1/Makefile.am
@@ -476,7 +476,9 @@ gen_files_kx509 =					\
 	asn1_KX509_ERROR_CODE.x				\
 	asn1_Kx509Request.x
 
-noinst_PROGRAMS = asn1_compile asn1_print asn1_gen
+noinst_PROGRAMS = asn1_gen
+
+libexec_heimdal_PROGRAMS = asn1_compile asn1_print
 
 TESTS = check-der check-gen check-timegm check-ber
 check_PROGRAMS = $(TESTS)
@@ -595,34 +597,34 @@ $(gen_files_rfc2459) rfc2459_asn1.hx: rfc2459_asn1_files
 $(gen_files_cms) cms_asn1.hx: cms_asn1_files
 $(gen_files_test) test_asn1.hx: test_asn1_files
 
-rfc2459_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/rfc2459.asn1
+rfc2459_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/rfc2459.asn1
 	$(ASN1_COMPILE) --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints $(srcdir)/rfc2459.asn1 rfc2459_asn1 || (rm -f rfc2459_asn1_files ; exit 1)
 
-cms_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/cms.asn1 $(srcdir)/cms.opt
+cms_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/cms.asn1 $(srcdir)/cms.opt
 	$(ASN1_COMPILE) --option-file=$(srcdir)/cms.opt $(srcdir)/cms.asn1 cms_asn1 || (rm -f cms_asn1_files ; exit 1)
 
-krb5_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/krb5.asn1 $(srcdir)/krb5.opt
+krb5_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/krb5.asn1 $(srcdir)/krb5.opt
 	$(ASN1_COMPILE) --option-file=$(srcdir)/krb5.opt $(srcdir)/krb5.asn1 krb5_asn1 || (rm -f krb5_asn1_files ; exit 1)
 
-pkinit_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/pkinit.asn1
+pkinit_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkinit.asn1
 	$(ASN1_COMPILE) $(srcdir)/pkinit.asn1 pkinit_asn1 || (rm -f pkinit_asn1_files ; exit 1)
 
-pkcs8_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/pkcs8.asn1
+pkcs8_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs8.asn1
 	$(ASN1_COMPILE) $(srcdir)/pkcs8.asn1 pkcs8_asn1 || (rm -f pkcs8_asn1_files ; exit 1)
 
-pkcs9_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/pkcs9.asn1
+pkcs9_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs9.asn1
 	$(ASN1_COMPILE) $(srcdir)/pkcs9.asn1 pkcs9_asn1 || (rm -f pkcs9_asn1_files ; exit 1)
 
-pkcs12_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/pkcs12.asn1
+pkcs12_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs12.asn1
 	$(ASN1_COMPILE) $(srcdir)/pkcs12.asn1 pkcs12_asn1 || (rm -f pkcs12_asn1_files ; exit 1)
 
-digest_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/digest.asn1
+digest_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/digest.asn1
 	$(ASN1_COMPILE) $(srcdir)/digest.asn1 digest_asn1 || (rm -f digest_asn1_files ; exit 1)
 
-kx509_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/kx509.asn1
+kx509_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/kx509.asn1
 	$(ASN1_COMPILE) $(srcdir)/kx509.asn1 kx509_asn1 || (rm -f kx509_asn1_files ; exit 1)
 
-test_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/test.asn1
+test_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1
 	$(ASN1_COMPILE) --sequence=TESTSeqOf $(srcdir)/test.asn1 test_asn1 || (rm -f test_asn1_files ; exit 1)
 
 EXTRA_DIST =		\
diff --git a/lib/sl/Makefile.am b/lib/sl/Makefile.am
index e138d89a5..cd8c72312 100644
--- a/lib/sl/Makefile.am
+++ b/lib/sl/Makefile.am
@@ -25,7 +25,7 @@ check_PROGRAMS = $(TESTS)
 
 # install these?
 
-noinst_PROGRAMS = slc
+libexec_heimdal_PROGRAMS = slc
 
 slc_SOURCES = slc-gram.y slc-lex.l slc.h