diff --git a/Libraries/hwloc/build b/Libraries/hwloc/build
index c65a014..6e021f3 100755
--- a/Libraries/hwloc/build
+++ b/Libraries/hwloc/build
@@ -1,13 +1,2 @@
 #!/usr/bin/env modbuild
 
-pbuild::set_download_url "https://download.open-mpi.org/release/${P}/v${V_MAJOR}.${V_MINOR}/${P}-${V}.tar.gz"
-pbuild::add_to_group 'Libraries'
-
-pbuild::install_docfiles 'README' 'AUTHORS' 'NEWS' 'COPYING' 'VERSION'
-
-pbuild::pre_configure() {
-  pbuild::add_configure_args "--enable-netloc"
-  pbuild::add_configure_args "--enable-plugins"
-}
-
-
diff --git a/Libraries/hwloc/build-legacy b/Libraries/hwloc/build-legacy
new file mode 100755
index 0000000..c65a014
--- /dev/null
+++ b/Libraries/hwloc/build-legacy
@@ -0,0 +1,13 @@
+#!/usr/bin/env modbuild
+
+pbuild::set_download_url "https://download.open-mpi.org/release/${P}/v${V_MAJOR}.${V_MINOR}/${P}-${V}.tar.gz"
+pbuild::add_to_group 'Libraries'
+
+pbuild::install_docfiles 'README' 'AUTHORS' 'NEWS' 'COPYING' 'VERSION'
+
+pbuild::pre_configure() {
+  pbuild::add_configure_args "--enable-netloc"
+  pbuild::add_configure_args "--enable-plugins"
+}
+
+
diff --git a/Libraries/hwloc/build-xml b/Libraries/hwloc/build-xml
deleted file mode 100755
index f2b8b67..0000000
--- a/Libraries/hwloc/build-xml
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env modbuild
-
-pbuild::pre_configure() {
-  pbuild::add_configure_args "--enable-netloc"
-  pbuild::add_configure_args "--enable-plugins"
-}
-
-