diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 89cd4863479c6..f3a3cc2d33fbe 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -311,10 +311,6 @@ net-libs/webkit-gtk webkit2
 # mask use numa for openmpi
 sys-cluster/openmpi openmpi_fabrics_psm openmpi_fabrics_knem openmpi_fabrics_open-mx openmpi_fabrics_ofed openmpi_fabrics_dapl openmpi_rm_slurm openmpi_ofed_features_rdmacm
 
-# Patrick McLean <chutzpah@gentoo.org> (08 Nov 2011)
-# mask conntrack USE flag for dnsmasq as dep is not keyworded
-net-dns/dnsmasq conntrack
-
 # Tobias Klausmann <klausman@gentoo.org> (02 Nov 2011)
 # libpcre jit is not supported on alpha
 dev-libs/libpcre jit
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 10c4b89238161..cbdbfe67b86bf 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -471,10 +471,6 @@ dev-qt/qtdeclarative -jit
 dev-qt/qtscript -jit
 dev-qt/qtwebkit -jit
 
-# Patrick McLean <chutzpah@gentoo.org> (08 Nov 2011)
-# mask conntrack USE flag for dnsmasq as dep is not keyworded
-net-dns/dnsmasq conntrack
-
 # Alexandre Rostovtsev <tetromino@gentoo.org> (03 Nov 2011)
 # Missing keywords in gst-plugins-{faac,lame,speex,twolame}, bug #389433
 gnome-extra/gnome-media aac mp3 speex twolame
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 7610a72acb925..4933ccbc4f9c5 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Felix Janda <felix.janda@posteo.de> (24 Sep 2016)
+# net-libs/libnetfilter_conntrack is not keyworded on mips
+net-dns/dnsmasq conntrack
+
 # Thomas Deutschmann <whissi@gentoo.org> (23 Aug 2016)
 # net-libs/openpgm is not keyworded on mips
 net-libs/zeromq pgm
diff --git a/profiles/arch/nios2/package.use.mask b/profiles/arch/nios2/package.use.mask
index 6dac8c22e9911..dc85f13d40a45 100644
--- a/profiles/arch/nios2/package.use.mask
+++ b/profiles/arch/nios2/package.use.mask
@@ -199,10 +199,6 @@ www-client/epiphany -jit
 # keyworded for arm
 net-misc/tinc vde
 
-# Patrick McLean <chutzpah@gentoo.org> (08 Nov 2011)
-# mask conntrack USE flag for dnsmasq as dep is not keyworded
-net-dns/dnsmasq conntrack
-
 # Alexandre Rostovtsev <tetromino@gentoo.org> (03 Nov 2011)
 # Missing keywords in gst-plugins-{faac,lame,speex,twolame}, bug #389433
 gnome-extra/gnome-media aac mp3 speex twolame
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.use.mask b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
index 04d34f72e4525..92f402e42bb9f 100644
--- a/profiles/arch/powerpc/ppc64/64ul/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
@@ -10,10 +10,6 @@
 # Mask because requires a lot of unstable depends not ready for the stabilization
 gnome-extra/nm-applet bluetooth
 
-# Patrick McLean <chutzpah@gentoo.org> (08 Nov 2011)
-# mask conntrack USE flag for dnsmasq as dep is not keyworded
-net-dns/dnsmasq conntrack
-
 # Brent Baude <ranger@gentoo.org> (06 Jan 2010)
 # masking toolame for mplayer bug 280281
 media-video/mplayer toolame
diff --git a/profiles/default/bsd/fbsd/package.use.mask b/profiles/default/bsd/fbsd/package.use.mask
index e9bf0d39e5fb5..341448d9dd0de 100644
--- a/profiles/default/bsd/fbsd/package.use.mask
+++ b/profiles/default/bsd/fbsd/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Felix Janda <felix.janda@posteo.de> (24 Sep 2016)
+# net-libs/libnetfilter_conntrack is not keyworded on FreeBSD
+net-dns/dnsmasq conntrack
+
 # Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
 # libressl:  dev-libs/libressl is a base package on FreeBSD
 # jemalloc:  dev-libs/jemalloc is not keyworded on FreeBSD
diff --git a/profiles/default/linux/uclibc/mips/package.use.mask b/profiles/default/linux/uclibc/mips/package.use.mask
index f18f306081663..5b9f6677fa0fa 100644
--- a/profiles/default/linux/uclibc/mips/package.use.mask
+++ b/profiles/default/linux/uclibc/mips/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Felix Janda <felix.janda@posteo.de> (24 Sep 2016)
+# net-libs/libnetfilter_conntrack is not keyworded on mips
+net-dns/dnsmasq conntrack
+
 # Thomas Deutschmann <whissi@gentoo.org> (23 Aug 2016)
 # net-libs/openpgm is not keyworded on mips
 net-libs/zeromq pgm