diff --git a/contrib/ci/dependencies.xml b/contrib/ci/dependencies.xml
index 3dbb4b1eb..eac660a3b 100644
--- a/contrib/ci/dependencies.xml
+++ b/contrib/ci/dependencies.xml
@@ -1097,7 +1097,7 @@
     <distro id="ubuntu">
       <package variant="x86_64" />
     </distro>
-  </dependency>    
+  </dependency>
   <dependency type="build" id="python3-requests">
     <distro id="fedora">
       <package />
@@ -1380,4 +1380,12 @@
       <package />
     </distro>
   </dependency>
+  <dependency type="build" id="shellcheck">
+    <distro id="ubuntu">
+      <package variant="x86_64" />
+    </distro>
+    <distro id="fedora">
+      <package>ShellCheck</package>
+    </distro>
+  </dependency>
 </dependencies>
diff --git a/contrib/setup b/contrib/setup
index 3b0b92880..5bd8de64b 100755
--- a/contrib/setup
+++ b/contrib/setup
@@ -17,9 +17,6 @@ if [ -n "$PS1" ] || [[ $- == *i* ]] || [ -f /dev/.cros_milestone ]; then
     read -p  "Install build dependencies? (y/n) " question
     if [ "$question" = "y" ]; then
         DEPS=$(./contrib/ci/generate_dependencies.py)
-        if ! which shellcheck >/dev/null 2>&1; then
-            DEPS="$DEPS shellcheck"
-        fi
         OS=$(python3 -c "import distro; print(distro.linux_distribution()[0].split()[0].lower())")
         if [ "$OS" = "debian" ] || [ "$OS" = "ubuntu" ]; then
             if ! python3 -c "import venv"; then