diff --git a/src/Kconfig b/src/Kconfig
index 56ebe82e02..ba9ae86067 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -461,6 +461,7 @@ endmenu
 menu "Security"
 
 source "src/security/Kconfig"
+source "src/vendorcode/eltan/security/Kconfig"
 
 endmenu
 
diff --git a/src/vendorcode/eltan/Kconfig b/src/vendorcode/eltan/Kconfig
deleted file mode 100644
index 30bb8b8ab8..0000000000
--- a/src/vendorcode/eltan/Kconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2019 Eltan B.V.
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; version 2 of the License.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-
-config USE_VENDORCODE_ELTAN
-	bool
-
-if USE_VENDORCODE_ELTAN
-source src/vendorcode/eltan/security/Kconfig
-endif
diff --git a/src/vendorcode/eltan/security/Kconfig b/src/vendorcode/eltan/security/Kconfig
index 6b93d2a97a..1cc0365720 100644
--- a/src/vendorcode/eltan/security/Kconfig
+++ b/src/vendorcode/eltan/security/Kconfig
@@ -12,7 +12,16 @@
 ## GNU General Public License for more details.
 ##
 
+config USE_VENDORCODE_ELTAN
+	bool
+
+if USE_VENDORCODE_ELTAN
+
 menu "Eltan Security Settings"
+
 source src/vendorcode/eltan/security/mboot/Kconfig
 source src/vendorcode/eltan/security/verified_boot/Kconfig
+
 endmenu
+
+endif