diff --git a/scripts/cros_setup_toolchains.py b/scripts/cros_setup_toolchains.py
index 520e76a..14825c1 100644
--- a/scripts/cros_setup_toolchains.py
+++ b/scripts/cros_setup_toolchains.py
@@ -105,9 +105,9 @@
 )
 
 LLVM_PKGS_TABLE = {
+    'ex_llvm-libunwind' : ['--ex-pkg', 'sys-libs/llvm-libunwind'],
     'ex_libcxxabi' : ['--ex-pkg', 'sys-libs/libcxxabi'],
     'ex_libcxx' : ['--ex-pkg', 'sys-libs/libcxx'],
-    'ex_llvm-libunwind' : ['--ex-pkg', 'sys-libs/llvm-libunwind'],
 }
 
 class Crossdev(object):
@@ -120,10 +120,10 @@
   MANUAL_PKGS = {
       'rust': 'dev-lang',
       'llvm': 'sys-devel',
+      'llvm-libunwind': 'sys-libs',
       'libcxxabi': 'sys-libs',
       'libcxx': 'sys-libs',
       'elfutils': 'dev-libs',
-      'llvm-libunwind': 'sys-libs',
   }
 
   @classmethod