diff --git a/admin/panels/config/admin.config.php b/admin/panels/config/admin.config.php
index e6ec721..8abc1e6 100755
--- a/admin/panels/config/admin.config.php
+++ b/admin/panels/config/admin.config.php
@@ -20,6 +20,7 @@
 			array('timeoffset', 'timeoffset', 'isNumber', false, false, 'trim'),
 			array('timeformat', 'timeformat', 'notEmpty', false, false, 'trim'),
 			array('dateformat', 'dateformat', 'notEmpty', false, false, 'trim'),
+			array('dateformatshort', 'dateformatshort', 'notEmpty', false, false, 'trim'),
 			
 			array('lang', 'lang', 'notEmpty', false, false, 'trim'),
 			array('charset', 'charset', 'notEmpty', false, false, 'trim'),
@@ -73,6 +74,7 @@
 				'timeoffset' => $_POST['timeoffset'],
 				'timeformat' => $_POST['timeformat'],
 				'dateformat' => $_POST['dateformat'],
+				'dateformatshort' => $_POST['dateformatshort'],
 				'charset'	 => $_POST['charset'],
 				'lang'		 => $_POST['lang']
 			);
diff --git a/admin/panels/config/admin.config.tpl b/admin/panels/config/admin.config.tpl
index c5920fa..2bdffb7 100755
--- a/admin/panels/config/admin.config.tpl
+++ b/admin/panels/config/admin.config.tpl
@@ -103,6 +103,13 @@
 			<p> {$panelstrings.output}:   {$smarty.now|date_format:$fp_config.locale.dateformat}  </p>
 		</dd>
 
+		<dt><label for="dateformatshort"> {$panelstrings.dateformatshort} </label></dt>
+		<dd>	<p> <input type="text" name="dateformatshort" id="dateformatshort" 
+			class="textinput{$error.dateformatshort|notempty:" field-error"}" 
+			value="{$fp_config.locale.dateformatshort}" /> </p>
+			<p> {$panelstrings.output}:   {$smarty.now|date_format:$fp_config.locale.dateformatshort}  </p>
+		</dd>
+
 		<dt><label for="timeformat"> {$panelstrings.timeformat} </label></dt>
 		<dd>	<p> <input type="text" name="timeformat" id="timeformat" 
 			class="textinput{$error.timeformat|notempty:" field-error"}" 
diff --git a/admin/panels/entry/admin.entry.list.tpl b/admin/panels/entry/admin.entry.list.tpl
index 386ad5e..0739e09 100755
--- a/admin/panels/entry/admin.entry.list.tpl
+++ b/admin/panels/entry/admin.entry.list.tpl
@@ -51,7 +51,7 @@
 <tbody>
 {entry}
 <tr>
-<td>{$id|entry_idtotime|date_format:"%D, %T"}</td>
+<td>{$id|entry_idtotime|date_format:"`$fp_config.locale.dateformatshort`, `$fp_config.locale.timeformat`"}</td>
 <td class="main-cell">
 {if in_array('draft',$categories)}
 (<em class="entry-flag">{$lang.entry.flags.short.draft}</em>)
diff --git a/fp-defaults/settings-defaults.php b/fp-defaults/settings-defaults.php
index 1f8b6c7..12f50a0 100755
--- a/fp-defaults/settings-defaults.php
+++ b/fp-defaults/settings-defaults.php
@@ -22,6 +22,7 @@ $fp_config = array (
     'timeoffset' => '2',
     'timeformat' => '%H:%M:%S',
     'dateformat' => '%A, %B %e, %Y',
+    'dateformatshort' => '%Y-%m-%d',
     'charset' => 'utf-8',
     'lang' => 'en-us',
   ),
diff --git a/fp-interface/lang/en-us/lang.admin.config.php b/fp-interface/lang/en-us/lang.admin.config.php
index e33a79b..847bf01 100755
--- a/fp-interface/lang/en-us/lang.admin.config.php
+++ b/fp-interface/lang/en-us/lang.admin.config.php
@@ -39,6 +39,7 @@
 		'hours'			=> 'hours',
 		'timeformat'		=> 'Default format for time',
 		'dateformat'		=> 'Default format for date',
+		'dateformatshort'	=> 'Default format for date (short)',
 		'output'		=> 'Output',
 		'charset'		=> 'Character set',
 		'charsettip'	=> 'The character set you write your blog in (UTF-8 is '.
diff --git a/fp-interface/themes/leggero/preview.tpl b/fp-interface/themes/leggero/preview.tpl
index 54256bd..bcafea8 100755
--- a/fp-interface/themes/leggero/preview.tpl
+++ b/fp-interface/themes/leggero/preview.tpl
@@ -1,7 +1,7 @@
 			{entry content=$entry}
 			<div class="entry">
 				<h3>{$subject|tag:the_title}</h3>
-				<p class="date">Published by {$author} on {$date|date_format:"%A, %B %e, %Y - %H:%M:%S"} </p>
+				<p class="date">Published by {$author} on {$date|date_format:$fp_config.locale.dateformat} </p>
 				{$content|tag:the_content}
 			</div>
 			{/entry}
diff --git a/fp-interface/themes/leggero/previewstatic.tpl b/fp-interface/themes/leggero/previewstatic.tpl
index 25e06f6..286a650 100755
--- a/fp-interface/themes/leggero/previewstatic.tpl
+++ b/fp-interface/themes/leggero/previewstatic.tpl
@@ -1,7 +1,7 @@
 			{static content=$entry}
 			<div class="entry">
 				<h3>{$subject}</h3>
-				<p class="date">Published by {$author} on {$date|date_format:"%A, %B %e, %Y - %H:%M:%S"} </p>
+				<p class="date">Published by {$author} on {$date|date_format:$fp_config.locale.dateformat} </p>
 				{$content}
 			</div>
 			{/static}