diff --git a/config.rb b/config.rb
index b9676ff174191c9087816fed99afc688515c414a..e18c81c244744bd63d22ccc44036e53f30902ac1 100644
--- a/config.rb
+++ b/config.rb
@@ -100,10 +100,18 @@ helpers do
     end
     
     def page_title
-        if current_page.data.title.present?
+        if current_page.data.header_title.present?
+            current_page.data.header_title
+        elsif current_page.data.title.present?
             current_page.data.title
         end
     end
+
+    def page_description
+        if current_page.data.description.present?
+            current_page.data.description
+        end
+    end
 end
 
 # Add bower's directory to sprockets asset path
diff --git a/source/index.html.haml b/source/index.html.haml
index 6e2455ce6dc1122883d4a699a1ed48cea4b34495..984c8a569af646c4e0b6506ae325b2ab99b2324c 100644
--- a/source/index.html.haml
+++ b/source/index.html.haml
@@ -1,5 +1,7 @@
 ---
 title: Overview
+header_title: Aparapi
+description: Open-source framework for executing native Java code on the GPU.
 ---
 - content_for :additional_header do
   .row.center
diff --git a/source/layout.html.haml b/source/layout.html.haml
index 4f577346d5ecb0fccb3531cc2c15b279c9c3476a..4a157d6c84847406823deacdf3172794a0022d7a 100644
--- a/source/layout.html.haml
+++ b/source/layout.html.haml
@@ -40,7 +40,8 @@
         .container
           %h1.header.center-on-small-only #{page_title}
           .row.center
-            %h4.header.col.s12.light.center Open-source framework for executing native Java code on the GPU.
+            - if page_description
+              %h4.header.col.s12.light.center #{page_description}
           = yield_content(:additional_header) if content_for?(:additional_header)
         = yield_content(:banner) if content_for?(:banner)
       .container