diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f40040f6f0..79b3b1ddba3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -353,8 +353,6 @@ add_subdirectory (libs)
 add_subdirectory (utils)
 add_subdirectory (dbms)
 
-add_subdirectory (arch)
-
 include (cmake/print_include_directories.cmake)
 
 if (GLIBC_COMPATIBILITY)
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 46d5519fa76..3b523822451 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -35,3 +35,5 @@ endif ()
 if (ENABLE_CODE_QUALITY)
     add_subdirectory (check-style)
 endif ()
+
+add_subdirectory (package)
diff --git a/utils/package/CMakeLists.txt b/utils/package/CMakeLists.txt
new file mode 100644
index 00000000000..8c8a09adc0f
--- /dev/null
+++ b/utils/package/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory (arch)
diff --git a/arch/CMakeLists.txt b/utils/package/arch/CMakeLists.txt
similarity index 100%
rename from arch/CMakeLists.txt
rename to utils/package/arch/CMakeLists.txt
diff --git a/arch/PKGBUILD.in b/utils/package/arch/PKGBUILD.in
similarity index 100%
rename from arch/PKGBUILD.in
rename to utils/package/arch/PKGBUILD.in
diff --git a/arch/README.md b/utils/package/arch/README.md
similarity index 100%
rename from arch/README.md
rename to utils/package/arch/README.md