diff --git a/system/htmly.php b/system/htmly.php
index c2cb4a5..f814963 100644
--- a/system/htmly.php
+++ b/system/htmly.php
@@ -149,7 +149,7 @@ get('/:year/:month/:name', function($year, $month, $name){
 	render('post',array(
 		'title' => $current->title .' - ' . config('blog.title'),
 		'p' => $current,
-		'authorinfo' => '<div class="author-info"><div class="separator">&rarr;</div><h4><strong>by ' . $bio->title . '</strong></h4>' . $bio->body . '</div>',
+		'authorinfo' => '<div class="author-info"><h4>by <strong>' . $bio->title . '</strong></h4>' . $bio->body . '</div>',
 		'canonical' => $current->url,
 		'description' => $description = get_description($current->body),
 		'bodyclass' => 'inpost',
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index d0d329d..6387f46 100644
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -552,20 +552,52 @@ aside .copyright p{
 }
 
 /*----------------------------
-	Author info
+	Share + Author info
 -----------------------------*/
 
+.separator {
+	text-align:left;
+	font-size: 18px;
+	line-height: 1;
+}
+
+.share-box {
+	margin-bottom: 0.75em;
+}
+
 .author-info {
 	font-size: 12px;
 	font-style:italic;
+	float:left;
+	width: 430px;
+	margin-right: 2em;
 }
 
-.separator {
-	text-align:left;
-	font-size: 18px;
-	line-height: 1;
+.share {
+	font-size: 12px;
+	font-style:italic;
+	width:120px;
 }
 
+.share a {
+	display: inline-block;
+	width: 18px;
+	height: 18px;
+	margin: 2px;
+	vertical-align: middle;
+	-o-transition: all .3s;
+	-moz-transition: all .3s;
+	-webkit-transition: all .3s;
+	-ms-transition: all .3s;
+	text-indent: -9999em;
+}
+
+.share a.twitter { background: url(../img/share-twitter.png) left top no-repeat; }
+.share a.facebook { background: url(../img/share-facebook.png) left top no-repeat; }
+.share a.googleplus { background: url(../img/share-googleplus.png) left top no-repeat; }
+
+.share a:hover { background-position: left -26px; }
+
 /*----------------------------
 	Media queries
 -----------------------------*/
@@ -640,6 +672,16 @@ aside .copyright p{
 	.search {
 		text-align:center;
 	}
+	
+	.author-info {
+		width: 100%;
+	}
+	
+	.share {
+		float:left;
+		width:100%;
+		padding-bottom: 1em;
+	}
 }
 
 /*----------------------------
diff --git a/themes/default/img/share-facebook.png b/themes/default/img/share-facebook.png
new file mode 100644
index 0000000..5541821
Binary files /dev/null and b/themes/default/img/share-facebook.png differ
diff --git a/themes/default/img/share-googleplus.png b/themes/default/img/share-googleplus.png
new file mode 100644
index 0000000..fb077cd
Binary files /dev/null and b/themes/default/img/share-googleplus.png differ
diff --git a/themes/default/img/share-twitter.png b/themes/default/img/share-twitter.png
new file mode 100644
index 0000000..26f102b
Binary files /dev/null and b/themes/default/img/share-twitter.png differ
diff --git a/themes/default/post.html.php b/themes/default/post.html.php
index f5da1e1..471e4e4 100644
--- a/themes/default/post.html.php
+++ b/themes/default/post.html.php
@@ -13,10 +13,20 @@
 		</div>
 	</div>
 	<?php if ($type == 'blogpost'):?>
-		<?php if (config('author.info') == 'true'):?>
-			<?php echo $authorinfo ?>
-		<?php endif;?>
-	<?php endif;?>	
+		<div class="separator">&rarr;</div>
+		<div class="share-box">
+			<?php if (config('author.info') == 'true'):?>
+				<?php echo $authorinfo ?>
+				<style>.share {float:right;}</style>
+			<?php endif;?>
+			<div class="share">
+				<h4>Share this post</h4>
+				<a class="twitter" href="https://twitter.com/share?url=<?php echo $p->url ?>&text=<?php echo $p->title?>">Twitter</a>
+				<a class="facebook" href="https://www.facebook.com/sharer.php?u=<?php echo $p->url ?>&t=<?php echo $p->title?>">Facebook</a>
+				<a class="googleplus" href="https://plus.google.com/share?url=<?php echo $p->url ?>">Google+</a>
+			</div>
+		</div>
+	<?php endif;?>
     <div class="comments border">
 		<?php if ($type == 'blogpost'):?>
 			<?php if (disqus(null, null) == true):?>