In July 2016, the U.S. Department of Education Office for Civil Rights (OCR) issued two documents to clarify and provide guidance on Federal obligations of school districts to students with attention deficit hyperactivity disorder (ADHD) under Section 504. This action was in response to numerous complaints (approximately 2,000 over 5 years) alleging discrimination on the basis of disability in elementary and secondary education programs related to ADHD. Because of the sheer number and consistent nature of these complaints, OCR issued a policy resource guide for school personnel and a know-your-rights document for parents and guardians. In particular, OCR provided policy guidance to ensure students are receiving a free appropriate public education (FAPE) as defined in Section 504. The purpose of this article is to highlight key recommendations from OCR and to discuss the challenges, obligations, and opportunities these recommendations pose for school psychologists and school-based mental health professionals.