diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4740d6b..e5be3cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ### HEAD
+* Return instead of echo class names in `roots_main_class` and `roots_sidebar_class`
 * Move nav customizations into `lib/nav.php`
 
 ### 6.1.0: October 2nd, 2012
diff --git a/base.php b/base.php
index 02e31ed..9133ed7 100644
--- a/base.php
+++ b/base.php
@@ -14,11 +14,11 @@
 
   <div id="wrap" class="container" role="document">
     <div id="content" class="row">
-      <div id="main" class="<?php roots_main_class(); ?>" role="main">
+      <div id="main" class="<?php echo roots_main_class(); ?>" role="main">
         <?php include roots_template_path(); ?>
       </div>
       <?php if (roots_display_sidebar()) : ?>
-      <aside id="sidebar" class="<?php roots_sidebar_class(); ?>" role="complementary">
+      <aside id="sidebar" class="<?php echo roots_sidebar_class(); ?>" role="complementary">
         <?php get_template_part('templates/sidebar'); ?>
       </aside>
       <?php endif; ?>
diff --git a/lib/config.php b/lib/config.php
index 48ba980..6b9ec43 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -46,15 +46,17 @@ function roots_display_sidebar() {
 // #main CSS classes
 function roots_main_class() {
   if (roots_display_sidebar()) {
-    echo 'span8';
+    $class = 'span8';
   } else {
-    echo 'span12';
+    $class = 'span12';
   }
+
+  return $class;
 }
 
 // #sidebar CSS classes
 function roots_sidebar_class() {
-  echo 'span4';
+  return 'span4';
 }
 
 // Configuration values