diff --git a/metadata/layout.conf b/metadata/layout.conf
index 4962033a4f..474114e707 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -11,3 +11,7 @@ sign-manifests = false
 
 # Let's start with new EAPIs if possible
 eapis-banned = 0 1 2 3 4 5
+
+# Part of ability to mask features in overlays
+# https://trofi.github.io/posts/201-masking-a-package-in-gentoo-overlay.html
+profile-formats = portage-2
diff --git a/profiles/arch.list b/profiles/arch.list
new file mode 100644
index 0000000000..136c05e0d0
--- /dev/null
+++ b/profiles/arch.list
@@ -0,0 +1 @@
+hidden
diff --git a/profiles/arches.desc b/profiles/arches.desc
new file mode 100644
index 0000000000..08285f15a3
--- /dev/null
+++ b/profiles/arches.desc
@@ -0,0 +1 @@
+hidden  testing
diff --git a/profiles/default/linux/amd64/17.1/hardened/selinux/parent b/profiles/default/linux/amd64/17.1/hardened/selinux/parent
new file mode 100644
index 0000000000..285d54a175
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/hardened/selinux/parent
@@ -0,0 +1,2 @@
+gentoo:default/linux/amd64/17.1/hardened/selinux
+:features/selinux
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/parent b/profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/parent
new file mode 100644
index 0000000000..7194320213
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/parent
@@ -0,0 +1,2 @@
+gentoo:default/linux/amd64/17.1/no-multilib/hardened/selinux
+:features/selinux
diff --git a/profiles/default/linux/amd64/17.1/selinux/parent b/profiles/default/linux/amd64/17.1/selinux/parent
new file mode 100644
index 0000000000..d81c16d4b5
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/selinux/parent
@@ -0,0 +1,2 @@
+gentoo:default/linux/amd64/17.1/selinux
+:features/selinux
diff --git a/profiles/default/linux/x86/17.0/hardened/selinux/parent b/profiles/default/linux/x86/17.0/hardened/selinux/parent
new file mode 100644
index 0000000000..a526822306
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/hardened/selinux/parent
@@ -0,0 +1,2 @@
+gentoo:default/linux/x86/17.0/hardened/selinux
+:features/selinux
diff --git a/profiles/default/linux/x86/17.0/selinux/parent b/profiles/default/linux/x86/17.0/selinux/parent
new file mode 100644
index 0000000000..ff294cedb6
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/selinux/parent
@@ -0,0 +1,2 @@
+gentoo:default/linux/x86/17.0/selinux
+:features/selinux
diff --git a/profiles/package.mask b/profiles/features/selinux/package.mask
similarity index 60%
rename from profiles/package.mask
rename to profiles/features/selinux/package.mask
index 0fe3618142..b5ea3a429d 100644
--- a/profiles/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -1,3 +1,3 @@
-# Theo Anderson <telans@posteo.de> (2020-12-06)
+# Theo Anderson <telans@posteo.de> (2021-01-04)
 # SELinux profiles do not support systemd
 >=sys-block/systemd-swap-4.4.0
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
new file mode 100644
index 0000000000..e1efe75e70
--- /dev/null
+++ b/profiles/profiles.desc
@@ -0,0 +1,5 @@
+hidden  default/linux/amd64/17.1/selinux                        stable
+hidden  default/linux/amd64/17.1/hardened/selinux               stable
+hidden  default/linux/amd64/17.1/no-multilib/hardened/selinux   stable
+hidden  default/linux/x86/17.0/selinux                          stable
+hidden  default/linux/x86/17.0/hardened/selinux                 stable