diff --git a/header.php b/header.php
index a37b052f..c6f1a418 100644
--- a/header.php
+++ b/header.php
@@ -21,7 +21,7 @@
 </head>
 
 <body <?php body_class(); ?>>
-<div id="page" class="hfeed site">
+<div id="page" class="site">
 	<a class="skip-link screen-reader-text" href="#content"><?php esc_html_e( 'Skip to content', '_s' ); ?></a>
 
 	<header id="masthead" class="site-header" role="banner">
diff --git a/inc/extras.php b/inc/extras.php
index 5503d38d..971d0ba1 100644
--- a/inc/extras.php
+++ b/inc/extras.php
@@ -18,6 +18,11 @@ function _s_body_classes( $classes ) {
 	if ( is_multi_author() ) {
 		$classes[] = 'group-blog';
 	}
+	
+	// Adds a class of hfeed to non-singular pages.
+	if ( ! is_singular() ) {
+		$classes[] = 'hfeed';
+	}
 
 	return $classes;
 }
