diff --git a/src/configure.ac b/src/configure.ac
index 800deef..21d62c4 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1,17 +1,19 @@
 AC_INIT(executor, 2.1pr16, ctm@ardi.com)
+AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE([-Wall])
 
 AM_PROG_AS
 
 AC_CONFIG_SRCDIR([executor.c])
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_LINKS
-
-AC_CANONICAL_SYSTEM
 
 AC_GNU_SOURCE
 
 AC_SYS_LARGEFILE
 
 AC_CONFIG_FILES([Makefile])
+
+AC_CONFIG_LINKS([target-os-config.h:config/os/$target_os/$target_os.h
+                target-arch-config.h:config/arch/$target_cpu/$target_cpu.h])
+
 AC_OUTPUT