diff --git a/config/common.mk b/config/common.mk
index ba409ed..71ae716 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -230,9 +230,14 @@
 ifneq ($(TARGET_BUILD_VARIANT),user)
 PRODUCT_PACKAGES += \
     procmem \
-    procrank \
+    procrank
+
+# Conditionally build in su
+ifeq ($(WITH_SU),true)
+PRODUCT_PACKAGES += \
     su
 endif
+endif
 
 DEVICE_PACKAGE_OVERLAYS += vendor/cm/overlay/common