diff --git a/jOOQ-website/css/jooq.css b/jOOQ-website/css/jooq.css
index 2b32fce138..f9bd237ede 100644
--- a/jOOQ-website/css/jooq.css
+++ b/jOOQ-website/css/jooq.css
@@ -218,6 +218,24 @@ h2 a:hover {
     background: gradient(linear, left top, left bottom, from(#555), to(#333));
 }
 
+#tweets {
+    padding-top: 4px;
+    height: 25px;
+    float: left;
+}
+
+#menu {
+    float: right;
+}
+
+div.tweet-item {
+    float: left;
+    width: 100px;
+    white-space: nowrap;
+    overflow: hidden;
+}
+
+/*
 #tweets {
     height: 25px;
     float: left;
@@ -236,6 +254,7 @@ div.tweet-item img {
     box-shadow: 0 0 5px #000;
     border: 0;
 }
+*/
 
 #navigation a,
 #navigation a:link,
@@ -314,4 +333,41 @@ code {
 
 .mono {
     font-family: monospace;
+}
+
+#intro {
+    height: auto;
+    margin-top: 40px;
+}
+
+#intro .row {
+    width: 100%;
+    margin-top: 0;
+    margin-left: auto;
+    margin-right: auto;
+    margin-bottom: 30px;
+    overflow: hidden;
+}
+
+#intro .col {
+    float: left;
+    height: 300px;
+    margin: 0;
+    overflow: hidden;
+}
+
+#intro .col > * {
+    margin-right: 20px;
+}
+
+#intro .col-1 {
+    width: 33%;
+}
+
+#intro .col-2 {
+    width: 66%;
+}
+
+#intro .col-3 {
+    width: 100%;
 }
\ No newline at end of file
diff --git a/jOOQ-website/frame.php b/jOOQ-website/frame.php
index bca6456143..4589015b01 100644
--- a/jOOQ-website/frame.php
+++ b/jOOQ-website/frame.php
@@ -68,6 +68,44 @@ function manualHeader($isSingle, $forVersion) {
 	    <div id="navigation">
 	    <div class="wrapper">
 		<div id="tweets">
+			<div class="tweet-item">
+				<a href="http://twitter.com/share"
+					class="twitter-share-button"
+					data-url="http://www.jooq.org"
+					data-text="#jOOQ - A nice database abstraction library for Java"
+					data-count="horizontal" data-via="JavaOOQ">Tweet</a>
+				<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+				&nbsp;
+			</div>
+			<div class="tweet-item">
+				<g:plusone size="medium" href="http://www.jooq.org"></g:plusone>
+				&nbsp;
+			</div>
+			<div class="tweet-item">
+				<div id="fb-root"></div>
+				<script>(function(d, s, id) {
+				  var js, fjs = d.getElementsByTagName(s)[0];
+				  if (d.getElementById(id)) {return;}
+				  js = d.createElement(s); js.id = id;
+				  js.src = "//connect.facebook.net/en_US/all.js#appId=232666253447462&xfbml=1";
+				  fjs.parentNode.insertBefore(js, fjs);
+				}(document, 'script', 'facebook-jssdk'));</script>
+				<div class="fb-like"
+					data-send="false"
+					data-href="http://www.jooq.org"
+					data-layout="button_count"
+					data-width="450"
+					data-show-faces="true"
+					data-font="verdana"></div>
+					&nbsp;
+			</div>
+			<div class="tweet-item">
+				<script src="//platform.linkedin.com/in.js" type="text/javascript"></script>
+				<script type="IN/Share" data-url="http://www.jooq.org" data-counter="right"></script>
+			</div>
+
+		    <?php
+		    /*
 			<div class="tweet-item">
 				<a href="http://twitter.com/share?text=%23jOOQ,+a+fun+way+to+write+%23SQL+in+%23Java:+http://www.jooq.org" target="_blank">
 					<img src="<?=$root?>/img/social-tw.png" width="37" height="27" alt="Share jOOQ on Twitter" title="Share jOOQ on Twitter"/></a>
@@ -84,6 +122,16 @@ function manualHeader($isSingle, $forVersion) {
 				<a href="http://www.linkedin.com/shareArticle?mini=true&url=http://www.jooq.org" target="_blank">
 	    			<img src="<?=$root?>/img/social-in.png" alt="Share jOOQ on LinkedIn" title="Share jOOQ on LinkedIn"/></a>
 			</div>
+			<div class="tweet-item">
+				<a href="http://github.com/jOOQ/jOOQ" target="_blank">
+	    			<img src="<?=$root?>/img/social-gh.png" alt="See jOOQ on GitHub" title="See jOOQ on GitHub" style="background-color: #111"/></a>
+			</div>
+			<div class="tweet-item">
+				<a href="http://stackoverflow.com/questions/tagged/jooq" target="_blank">
+	    			<img src="<?=$root?>/img/social-so.png" alt="See jOOQ on Stack Overflow" title="See jOOQ on Stack Overflow" style="background-color: #eee"/></a>
+			</div>
+			*/
+			?>
 		</div>
 
 	    <div id="menu">
diff --git a/jOOQ-website/img/social-gh.png b/jOOQ-website/img/social-gh.png
new file mode 100644
index 0000000000..470a72be73
Binary files /dev/null and b/jOOQ-website/img/social-gh.png differ
diff --git a/jOOQ-website/img/social-so.png b/jOOQ-website/img/social-so.png
new file mode 100644
index 0000000000..8dcd540070
Binary files /dev/null and b/jOOQ-website/img/social-so.png differ