diff --git a/views/_base.haml b/views/_base.haml
index 2e57bb4..364799d 100644
--- a/views/_base.haml
+++ b/views/_base.haml
@@ -1,3 +1,9 @@
+:ruby
+  @url_root = '/'
+  if ENV['RACK_ENV'] == 'production'
+    @url_root = '/canary/'
+  end
+
 !!! XML
 !!!
 %html
@@ -21,8 +27,8 @@
       Code Valet - Canary
   %body
     %nav.navbar.navbar-inverse.bg-warning.navbar-toggleable
-      %a.navbar-brand{:href => '/canary/'}
-        %img{:src => 'images/songbird-128.png',
+      %a.navbar-brand{:href => @url_root}
+        %img{:src => "#{@url_root}images/songbird-128.png",
           :width => '50', :height => '50', :alt => 'Grace the Canary in the Code Mine'}/
         Canary
       .navbar-collapse
diff --git a/views/index.haml b/views/index.haml
index 54cba56..acaef14 100644
--- a/views/index.haml
+++ b/views/index.haml
@@ -3,7 +3,7 @@
     .col-md-12
       %h2
         Meet Canary
-      %img{:src => 'images/songbird-128.png',
+      %img{:src => "#{@url_root}images/songbird-128.png",
         :title => 'Grace the Canary in the Code Mine',
            :align => :right}
       %p