diff --git a/y2015/BUILD b/y2015/BUILD
index 1219e63..22a0300 100644
--- a/y2015/BUILD
+++ b/y2015/BUILD
@@ -34,6 +34,7 @@
     '//y2015/control_loops/drivetrain:drivetrain_queue',
     '//y2015/control_loops/fridge:fridge_queue',
     '//y2015:constants',
+    '//y2015/autonomous:auto_queue',
     '//frc971/autonomous:auto_queue',
     '//y2015/actors:stack_action_lib',
     '//y2015/actors:stack_and_lift_action_lib',
diff --git a/y2015/autonomous/BUILD b/y2015/autonomous/BUILD
index 997c54f..352015a 100644
--- a/y2015/autonomous/BUILD
+++ b/y2015/autonomous/BUILD
@@ -1,5 +1,7 @@
 package(default_visibility = ['//visibility:public'])
 
+load('/aos/build/queues', 'queue_library')
+
 cc_library(
   name = 'auto_lib',
   srcs = [
@@ -24,6 +26,7 @@
     '//y2015/actors:stack_action_lib',
     '//y2015/actors:held_to_lift_action_lib',
     '//y2015/actors:pickup_action_lib',
+    ':auto_queue',
   ],
 )
 
@@ -38,3 +41,10 @@
     ':auto_lib',
   ],
 )
+
+queue_library(
+  name = 'auto_queue',
+  srcs = [
+    'auto.q',
+  ],
+)
diff --git a/y2015/wpilib/BUILD b/y2015/wpilib/BUILD
index d25c424..61d5c62 100644
--- a/y2015/wpilib/BUILD
+++ b/y2015/wpilib/BUILD
@@ -14,13 +14,13 @@
     '//y2015/control_loops/drivetrain:drivetrain_queue',
     '//y2015/control_loops/fridge:fridge_queue',
     '//y2015/control_loops/claw:claw_queue',
+    '//y2015/autonomous:auto_queue',
     '//aos/common/controls:control_loop',
     '//aos/common/util:log_interval',
     '//aos/common:time',
     '//aos/common/logging:queue_logging',
     '//aos/common/messages:robot_state',
     '//aos/common/util:phased_loop',
-    '//aos/common/messages:robot_state',
     '//frc971/wpilib:hall_effect',
     '//frc971/wpilib:joystick_sender',
     '//frc971/wpilib:loop_output_handler',