diff --git a/modules/rss/rss.view.php b/modules/rss/rss.view.php
index 8e6dc0761..bfdbe4921 100644
--- a/modules/rss/rss.view.php
+++ b/modules/rss/rss.view.php
@@ -89,7 +89,16 @@
             }
             $info->total_count = $output->total_count;
             $info->total_page = $output->total_page;
-            $info->date = date("D, d M Y H:i:s").' '.$GLOBALS['_time_zone'];
+            switch (Context::get('format')) {
+                case 'atom':
+                    $info->date = date('Y-m-d\TH:i:sP');
+                    if($mid) { $info->id = getUrl('','mid',$mid,'act','rss','format','atom','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date')); }
+                    else { $info->id = getUrl('','module','rss','act','rss','format','atom','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date')); }
+                    break;
+                default:
+                    $info->date = date("D, d M Y H:i:s").' '.$GLOBALS['_time_zone'];
+                    break;
+            }
             $info->language = Context::getLangType();
 
             // RSS 출력물에서 사용될 변수 세팅
diff --git a/modules/rss/tpl/atom10.html b/modules/rss/tpl/atom10.html
index 9dc4fe800..55825b380 100644
--- a/modules/rss/tpl/atom10.html
+++ b/modules/rss/tpl/atom10.html
@@ -5,10 +5,10 @@
    <!--@if($info->description)-->
    <subtitle type="html">{str_replace('\'', '&apos;', htmlspecialchars($info->description))}</subtitle>
    <!--@end-->
-   <updated>{date('Y-m-d\TH:i:sP')}</updated>
-   <id>{getUrl('','mid',$mid,'module','rss','act','rss','format','atom1.0','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date'))}</id>
+   <updated>{$info->date}</updated>
+   <id>{$info->id}</id>
    <link rel="alternate" type="text/html" hreflang="{$info->language}" href="{$info->link}"/>
-   <link rel="self" type="application/atom+xml" href="{getUrl('','mid',$mid,'module','rss','act','rss','format','atom1.0','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date'))}"/>
+   <link rel="self" type="application/atom+xml" href="{$info->id}"/>
    <generator uri="http://www.zeroboard.com/" version="{__ZBXE_VERSION__}">XpressEngine</generator>
 <!--@foreach($document_list as $oDocument)-->   <entry>
       <title>{str_replace('\'', '&apos;',$oDocument->getTitle())}</title>