diff --git a/openbsc/configure.ac b/openbsc/configure.ac
index 636416b..56e4b60 100644
--- a/openbsc/configure.ac
+++ b/openbsc/configure.ac
@@ -29,6 +29,7 @@
         osmo_ac_build_nat="no"
     ])
 AM_CONDITIONAL(BUILD_NAT, test "x$osmo_ac_build_nat" = "xyes")
+AC_SUBST(osmo_ac_build_nat)
 
 AC_ARG_ENABLE([osmo-bsc], [AS_HELP_STRING([--enable-osmo-bsc], [Build the Osmo BSC])],
     [
@@ -106,6 +107,7 @@
     src/libgb/Makefile
     src/gprs/Makefile
     tests/Makefile
+    tests/atlocal
     tests/debug/Makefile
     tests/gsm0408/Makefile
     tests/db/Makefile