5 files changed, 35 insertions, 7 deletions
diff --git a/profiles/arch/amd64-fbsd/todo/package.use.mask b/profiles/arch/amd64-fbsd/todo/package.use.mask
index 6a86521b651f..b8dd5c39553e 100644
--- a/profiles/arch/amd64-fbsd/todo/package.use.mask
+++ b/profiles/arch/amd64-fbsd/todo/package.use.mask
@@ -172,16 +172,16 @@ media-video/vlc fluidsynth
 # sys-cluster/knem
 sys-cluster/openmpi openmpi_fabrics_knem
 
-# sys-infiniband/dapl
+# sys-fabric/dapl
 sys-cluster/openmpi openmpi_fabrics_dapl
 
-# sys-infiniband/ofed
+# sys-fabric/ofed
 sys-cluster/openmpi openmpi_fabrics_ofed
 
-# sys-infiniband/infinipath-psm
+# sys-fabric/infinipath-psm
 sys-cluster/openmpi openmpi_fabrics_psm
 
-# sys-infiniband/librdmacm
+# sys-fabric/librdmacm
 sys-cluster/openmpi openmpi_ofed_features_rdmacm
 
 # sys-cluster/open-mx
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 22e3fd8cb1d5..ef5c4304afdd 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -415,7 +415,7 @@ media-video/rtmpdump polarssl
 
 # Alexey Shvetsov <alexxy@gentoo.org> (16 Apr 2014)
 # libehca only works on ppc*
-sys-infiniband/ofed ofed_drivers_ehca
+sys-fabric/ofed ofed_drivers_ehca
 
 # Andreas K. Huettel <dilfridge@gentoo.org> (12 Apr 2014)
 # Upstream regularly forgets to update the bindings after changes in API,
diff --git a/profiles/categories b/profiles/categories
index 44414d4e1611..92d6c1812d8c 100644
--- a/profiles/categories
+++ b/profiles/categories
@@ -138,7 +138,7 @@ sys-devel
 sys-firmware
 sys-freebsd
 sys-fs
-sys-infiniband
+sys-fabric
 sys-kernel
 sys-libs
 sys-power
diff --git a/profiles/updates/2Q-2012 b/profiles/updates/2Q-2012
index 20d4b9df728b..48b428d00262 100644
--- a/profiles/updates/2Q-2012
+++ b/profiles/updates/2Q-2012
@@ -3,7 +3,7 @@ move dev-lisp/cl-asdf dev-lisp/asdf
 move dev-lisp/cl-asdf-binary-locations dev-lisp/asdf-binary-locations
 slotmove media-libs/libharu 2 0
 move sys-fs/bleachbit sys-apps/bleachbit
-move sys-infiniband/openib sys-infiniband/ofed
+move sys-fabric/openib sys-fabric/ofed
 move app-text/djview4 app-text/djview
 move app-text/focuswriter app-editors/focuswriter
 move app-mobilephone/jacksms-desktop app-mobilephone/freesmee
diff --git a/profiles/updates/2Q-2016 b/profiles/updates/2Q-2016
index d63bb7e479f0..51f9d9d60862 100644
--- a/profiles/updates/2Q-2016
+++ b/profiles/updates/2Q-2016
@@ -34,3 +34,31 @@ slotmove >=dev-php/pecl-apcu-5.0 0 7
 move sys-apps/microcode-data sys-firmware/intel-microcode
 slotmove >=dev-php/pecl-rrd-2.0 0 7
 slotmove >=dev-php/pecl-oauth-2.0 0 7
+move sys-infiniband/compat-dapl sys-fabric/compat-dapl
+move sys-infiniband/dapl sys-fabric/dapl
+move sys-infiniband/ibacm sys-fabric/ibacm
+move sys-infiniband/ibutils sys-fabric/ibutils
+move sys-infiniband/infiniband-diags sys-fabric/infiniband-diags
+move sys-infiniband/infinipath-psm sys-fabric/infinipath-psm
+move sys-infiniband/libcxgb3 sys-fabric/libcxgb3
+move sys-infiniband/libcxgb4 sys-fabric/libcxgb4
+move sys-infiniband/libehca sys-fabric/libehca
+move sys-infiniband/libibcm sys-fabric/libibcm
+move sys-infiniband/libibmad sys-fabric/libibmad
+move sys-infiniband/libibumad sys-fabric/libibumad
+move sys-infiniband/libibverbs sys-fabric/libibverbs
+move sys-infiniband/libibvpp sys-fabric/libibvpp
+move sys-infiniband/libipathverbs sys-fabric/libipathverbs
+move sys-infiniband/libmlx4 sys-fabric/libmlx4
+move sys-infiniband/libmlx5 sys-fabric/libmlx5
+move sys-infiniband/libmthca sys-fabric/libmthca
+move sys-infiniband/libnes sys-fabric/libnes
+move sys-infiniband/libocrdma sys-fabric/libocrdma
+move sys-infiniband/librdmacm sys-fabric/librdmacm
+move sys-infiniband/mstflint sys-fabric/mstflint
+move sys-infiniband/ofed sys-fabric/ofed
+move sys-infiniband/opensm sys-fabric/opensm
+move sys-infiniband/perftest sys-fabric/perftest
+move sys-infiniband/qperf sys-fabric/qperf
+move sys-infiniband/rds-tools sys-fabric/rds-tools
+move sys-infiniband/srptools sys-fabric/srptools