diff --git a/util/Makefile.in b/util/Makefile.in
index 2a2b21c2..69683b01 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -64,4 +64,4 @@ distclean: clean
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-subst.o: $(srcdir)/subst.c
+subst.o: $(srcdir)/subst.c $(top_builddir)/lib/config.h dirpaths.h
diff --git a/util/subst.c b/util/subst.c
index 62448312..6a5eab1b 100644
--- a/util/subst.c
+++ b/util/subst.c
@@ -5,9 +5,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>