diff --git a/app/config/default.php b/app/config/default.php
index 5484a113f..40ec53e40 100755
--- a/app/config/default.php
+++ b/app/config/default.php
@@ -29,6 +29,7 @@
 		'pasteVisibility'     => 'default',
 		'guestPosts'          => '1',
 		'pasteSearch'         => '1',
+		'showExp'             => '0',
 		'comments'            => '1',
 		'noExpire'            => 'all',
 		'csrf'                => '1',
diff --git a/app/lang/en/admin.php b/app/lang/en/admin.php
index 97b577f96..32b37d667 100755
--- a/app/lang/en/admin.php
+++ b/app/lang/en/admin.php
@@ -27,6 +27,7 @@
 	"save_all"              => "Save all",
 	"posted_at"             => "Posted at",
 	"expires_at"            => "Expires at",
+	"expires_on"            => "expires on",
 	"is_private"            => "Is private",
 	"has_password"          => "Has password",
 	"poster_ip"             => "Poster's IP",
@@ -89,6 +90,8 @@
 	"expire_1month"         => "1 month",
 	"expire_1year"          => "1 year",
 	"expire_forever"        => "Keep forever",
+	"show_exp"              => "Show expiration",
+	"show_exp_exp"          => "Show the expiration date for pastes.",
 	"expiration"            => "Expiration",
 	"expiration_exp"        => "This setting determines the maximum age for pastes created on this site.",
 	"noexpire_none"         => "Everyone must set a finite expiration time",
diff --git a/app/models/Paste.php b/app/models/Paste.php
index 8cb7b07b8..84821d87c 100755
--- a/app/models/Paste.php
+++ b/app/models/Paste.php
@@ -51,6 +51,7 @@ class Paste extends Eloquent {
 		'project',
 		'timestamp',
 		'expire',
+		'showExp',
 		'title',
 		'data',
 		'language',
diff --git a/app/views/skins/bootstrap/admin/site.blade.php b/app/views/skins/bootstrap/admin/site.blade.php
index a431d6512..45c4066c1 100755
--- a/app/views/skins/bootstrap/admin/site.blade.php
+++ b/app/views/skins/bootstrap/admin/site.blade.php
@@ -383,6 +383,29 @@
 								</div>
 							</div>
 
+							<div class="form-group">
+								{{
+									Form::label('show_exp', Lang::get('admin.show_exp'), array(
+										'class' => 'control-label col-sm-3 col-lg-2'
+									))
+								}}
+
+								<div class="col-sm-9 col-lg-10">
+									{{
+										Form::select('show_exp', array(
+											'1' => Lang::get('admin.enabled'),
+											'0' => Lang::get('admin.disabled'),
+										), $site->general->showExp, array(
+											'class' => 'form-control'
+										))
+									}}
+
+									<div class="help-block">
+										{{ Lang::get('admin.show_exp_exp') }}
+									</div>
+								</div>
+							</div>
+
 							<div class="form-group">
 								{{
 									Form::label('paste_search', Lang::get('admin.paste_search'), array(
diff --git a/app/views/skins/bootstrap/site/paste.blade.php b/app/views/skins/bootstrap/site/paste.blade.php
index faa37ff4f..77c756f4d 100755
--- a/app/views/skins/bootstrap/site/paste.blade.php
+++ b/app/views/skins/bootstrap/site/paste.blade.php
@@ -136,12 +136,27 @@
 
 		<div class="pre-info pre-footer">
 			<div class="row">
+				@if (! $site->general->showExp)
 				<div class="col-sm-6">
+				@else
+				<div class="col-sm-4">
+				@endif
 					{? $author = ($paste->author_id > 0) ? link_to("user/u{$paste->author_id}/pastes", $paste->author) : Lang::get('global.anonymous') ?}
 					{{ sprintf(Lang::get('global.posted_by'), $author, date('d M Y, H:i:s e', $paste->timestamp)) }}
 				</div>
 
+				@if ($site->general->showExp)
+				<div class="col-sm-4">
+					{{ Lang::get('admin.expires_on') }}
+					{{ $paste->expire > 0 ? date('d M Y, H:i:s e', $paste->expire) : '-' }}
+				</div>
+				@endif
+
+				@if (! $site->general->showExp)
 				<div class="col-sm-6 text-right">
+				@else
+				<div class="col-sm-4 text-right">
+				@endif
 					{{ sprintf(Lang::get('global.language'), $paste->language) }}
 					&bull;
 					{{ sprintf(Lang::get('global.views'), $paste->hits) }}