diff --git a/lib/utils.php b/lib/utils.php
index 118c2f3..8f6b56d 100644
--- a/lib/utils.php
+++ b/lib/utils.php
@@ -14,3 +14,17 @@ function roots_get_search_form($form) {
   return $form;
 }
 add_filter('get_search_form', 'roots_get_search_form');
+
+/**
+ * Add page slug to body_class() classes if it doesn't exist
+ */
+function roots_body_class($classes) {
+  // Add post/page slug
+  if (is_single() || is_page() && !is_front_page()) {
+  	if (!in_array(basename(get_permalink()), $classes)) {
+  		$classes[] = basename(get_permalink());
+  	}
+  }
+  return $classes;
+}
+add_filter('body_class', 'roots_body_class');