diff --git a/MAINTAINERS b/MAINTAINERS
index b51059bc28..4395d8df14 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -143,13 +143,13 @@ M: Neil Horman <nhorman@tuxdriver.com>
 F: lib/librte_eal/common/include/rte_compat.h
 F: lib/librte_eal/common/include/rte_function_versioning.h
 F: doc/guides/rel_notes/deprecation.rst
-F: devtools/validate-abi.sh
+F: devtools/check-abi-version.sh
 F: devtools/check-symbol-change.sh
-F: buildtools/check-abi-version.sh
+F: devtools/update-abi.sh
+F: devtools/update_version_map_abi.py
+F: devtools/validate-abi.sh
 F: buildtools/check-experimental-syms.sh
 F: buildtools/map-list-symbol.sh
-F: buildtools/update-abi.sh
-F: buildtools/update_version_map_abi.py
 
 Driver information
 M: Neil Horman <nhorman@tuxdriver.com>
diff --git a/buildtools/check-abi-version.sh b/devtools/check-abi-version.sh
similarity index 100%
rename from buildtools/check-abi-version.sh
rename to devtools/check-abi-version.sh
diff --git a/buildtools/update-abi.sh b/devtools/update-abi.sh
similarity index 95%
rename from buildtools/update-abi.sh
rename to devtools/update-abi.sh
index 15bc6feab1..b9b859a3e9 100755
--- a/buildtools/update-abi.sh
+++ b/devtools/update-abi.sh
@@ -42,5 +42,5 @@ echo "Path to update:" $update_path
 echo $abi_version > $abi_version_file
 
 find $update_path -name  \*version.map -exec \
-      ./buildtools/update_version_map_abi.py {} \
+      devtools/update_version_map_abi.py {} \
       $abi_version \; -print
diff --git a/buildtools/update_version_map_abi.py b/devtools/update_version_map_abi.py
similarity index 99%
rename from buildtools/update_version_map_abi.py
rename to devtools/update_version_map_abi.py
index 6b9aff7a43..616412a1c4 100755
--- a/buildtools/update_version_map_abi.py
+++ b/devtools/update_version_map_abi.py
@@ -6,7 +6,7 @@
 A Python program that updates and merges all available stable ABI versions into
 one ABI version, while leaving experimental ABI exactly as it is. The intended
 ABI version is supplied via command-line parameter. This script is to be called
-from the buildtools/update-abi.sh utility.
+from the devtools/update-abi.sh utility.
 """
 
 from __future__ import print_function