2 files changed, 37 insertions, 2 deletions
diff --git a/mk/build.mk b/mk/build.mk
index c74e16045..b9e6b5d56 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -33,8 +33,8 @@ POSTCONFIG=		-@\
 	done; \
 	fi; \
 	if [ "$$(grep ^BUSYBOX .config|md5sum)" != "$$(grep ^BUSYBOX .config.old|md5sum)" ];then \
-		if [ -f build_$(CPU_ARCH)/w-busybox*/busybox*/.configure_done ];then \
-			rm build_$(CPU_ARCH)/w-busybox*/busybox*/.configure_done; \
+		if [ -f build_*/w-busybox*/busybox*/.configure_done ];then \
+			rm build_*/w-busybox*/busybox*/.configure_done; \
 		fi; \
 	fi; \
 	fi
@@ -158,6 +158,9 @@ all: menuconfig
 # configuration
 # ---------------------------------------------------------------------------
 
+# force entering the subdir, as dependency checking is done there
+.PHONY: $(CONFIG)/conf $(CONFIG)/mconf
+
 $(CONFIG)/conf:
 	@$(MAKE) -C $(CONFIG) conf
 
diff --git a/mk/modules.mk b/mk/modules.mk
index 1c02e711f..225daca21 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -205,6 +205,38 @@ $(eval $(call KMOD_template,NET_ACT_PEDIT,net-act-pedit,\
 	$(MODULES_DIR)/kernel/net/sched/act_pedit \
 ,45))
 
+#
+# IPsec 
+#
+$(eval $(call KMOD_template,NET_KEY,net-ipsec-netkey,\
+	$(MODULES_DIR)/kernel/net/key/af_key \
+,60))
+
+$(eval $(call KMOD_template,INET_AH,net-ipsec-ah,\
+	$(MODULES_DIR)/kernel/net/ipv4/ah4 \
+,65))
+
+$(eval $(call KMOD_template,INET_ESP,net-ipsec-esp,\
+	$(MODULES_DIR)/kernel/net/ipv4/esp4 \
+,65))
+
+$(eval $(call KMOD_template,INET_IPCOMP,net-ipsec-comp,\
+	$(MODULES_DIR)/kernel/net/ipv4/ipcomp \
+	$(MODULES_DIR)/kernel/net/xfrm/xfrm_ipcomp \
+,70))
+
+$(eval $(call KMOD_template,INET_XFRM_MODE_TRANSPORT,net-ipsec-transport,\
+	$(MODULES_DIR)/kernel/net/ipv4/xfrm4_mode_transport \
+,75))
+
+$(eval $(call KMOD_template,INET_XFRM_MODE_TUNNEL,net-ipsec-tunnel,\
+	$(MODULES_DIR)/kernel/net/ipv4/xfrm4_mode_tunnel \
+,75))
+
+$(eval $(call KMOD_template,INET_XFRM_MODE_BEET,net-ipsec-beet,\
+	$(MODULES_DIR)/kernel/net/ipv4/xfrm4_mode_beet \
+,75))
+
 ##
 ## Filtering / Firewalling
 ##