diff --git a/main.html b/main.html
index 567f41b1db..2a3f2cca32 100644
--- a/main.html
+++ b/main.html
@@ -5,7 +5,6 @@
 
   <link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" />
   <link rel="stylesheet" href="/static/css/application.css" type="text/css" media="all" />
-  <link href="/static/css/print.css" rel="stylesheet" type="text/css" media="print"/>
 
   <script type="text/javascript" src="${ settings.LIB_URL }jquery-1.6.2.min.js"></script>
   <script type="text/javascript" src="${ settings.LIB_URL }jquery-ui-1.8.16.custom.min.js"></script>
diff --git a/sass/courseware/_courseware.scss b/sass/courseware/_courseware.scss
index 9d7ab8123a..2a54d0cd21 100644
--- a/sass/courseware/_courseware.scss
+++ b/sass/courseware/_courseware.scss
@@ -50,6 +50,12 @@ div.course-wrapper {
           width: auto;
           border-right: 0;
         }
+
+        @media print {
+          display: block;
+          width: auto;
+          border-right: 0;
+        }
       }
 
       section.problem {
@@ -63,6 +69,16 @@ div.course-wrapper {
           padding: 0;
         }
 
+        @media print {
+          display: block;
+          width: auto;
+          padding: 0;
+
+          canvas, img {
+            page-break-inside: avoid;
+          }
+        }
+
         span {
           &.unanswered, &.ui-icon-bullet {
             @include inline-block();
diff --git a/sass/layout/_layout.scss b/sass/layout/_layout.scss
index c0f52ad268..cc683e3c0a 100644
--- a/sass/layout/_layout.scss
+++ b/sass/layout/_layout.scss
@@ -17,6 +17,11 @@ html {
       background: #fff;
       border-bottom: 1px solid #bbb;
 
+      @media print {
+        border-bottom: 0;
+        @include border-radius(none);
+      }
+
       @media screen and (min-width: 1400px) {
         // @include border-radius(3px);
         @include box-shadow(0 0 4px #dfdfdf);