diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in
index 6997c89704..b94f1c6167 100644
--- a/src/comerr/Makefile.in
+++ b/src/comerr/Makefile.in
@@ -38,9 +38,9 @@ et_lex.lex.c: et_lex.lex.l
 compile_et:	compile_et.o error_table.o
 	$(Q)case $(SYS_NAME) in \
 	*_linux* | *_umlinux* | *_darwin* ) \
-	$(AFS_LDRULE_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr;; \
+	$(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr $(buildtool_roken) $(MT_LIBS);; \
 	* ) \
-	$(AFS_LDRULE_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr -ll;; \
+	$(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr -ll $(buildtool_roken) $(MT_LIBS);; \
 	esac
 
 libafscom_err.a: $(LT_objs)
diff --git a/src/comerr/compile_et.c b/src/comerr/compile_et.c
index 87e000e43b..e5b780c9d3 100644
--- a/src/comerr/compile_et.c
+++ b/src/comerr/compile_et.c
@@ -117,7 +117,6 @@ static const char msf_warning[] =
 char c_file[MAXPATHLEN];	/* output file */
 char h_file[MAXPATHLEN];	/* output */
 char msf_file[MAXPATHLEN];
-char et_file[MAXPATHLEN];	/* full path to input file */
 
 static void
 usage(void)
@@ -142,6 +141,7 @@ int
 main(int argc, char **argv)
 {
     char *p, *ename;
+    char *et_file;
     char const *const *cpp;
     int got_language = 0;
     char *got_include = 0;
@@ -314,7 +314,10 @@ main(int argc, char **argv)
 	filename = p;
     }
 
-    sprintf(et_file, "%s/%s", got_prefix, filename);
+    if (asprintf(&et_file, "%s/%s", got_prefix, filename) < 0) {
+	fprintf(stderr, "Couldn't allocate memory for filename\n");
+	exit(1);
+    }
 
     yyin = fopen(et_file, "r");
     if (!yyin) {
@@ -322,6 +325,8 @@ main(int argc, char **argv)
 	exit(1);
     }
 
+    free(et_file);
+
     /* on NT, yyout is not initialized to stdout */
     if (!yyout) {
 	yyout = stdout;