diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html
index cbcf6bd26..b6336a034 100644
--- a/common/tpl/common_layout.html
+++ b/common/tpl/common_layout.html
@@ -42,10 +42,10 @@
 <!--@end-->
 <!--@if($rss_url)-->
     <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="{$rss_url}" />
-    <link rel="alternate" type="application/atom+xml" title="Atom 1.0" href="{getUrl('','mid',Context::get('mid'),'act','rss','format','atom')}" />
+    <link rel="alternate" type="application/atom+xml" title="Atom 1.0" href="{$atom_url}" />
 <!--@elseif(Context::get('site_module_info')->mid==Context::get('mid'))-->
     <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="{getUrl('','module','rss','act','rss')}" />
-    <link rel="alternate" type="application/atom+xml" title="Atom 1.0" href="{getUrl('','module','rss','act','rss','format','atom')}" />
+    <link rel="alternate" type="application/atom+xml" title="Atom 1.0" href="{getUrl('','module','rss','act','atom')}" />
 <!--@end-->
 
 {@ $ssl_actions = Context::getSSLActions() }
diff --git a/modules/rss/rss.class.php b/modules/rss/rss.class.php
index 26a01e346..be9e4efd3 100644
--- a/modules/rss/rss.class.php
+++ b/modules/rss/rss.class.php
@@ -15,6 +15,7 @@
             $oModuleController = &getController('module');
 
             $oModuleController->insertActionForward('rss', 'view', 'rss');
+            $oModuleController->insertActionForward('rss', 'view', 'atom');
 
             // 2007. 10. 18 서비스형 모듈의 추가 설정에 참여하기 위한 trigger 추가
             $oModuleController->insertTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before');
@@ -31,6 +32,9 @@
         function checkUpdate() {
             $oModuleModel = &getModel('module');
 
+            $act = $oModuleModel->getActionForward('atom');
+            if(!$act) return true;
+
             // 2007. 10. 18 서비스형 모듈의 추가 설정에 참여하기 위한 trigger 추가
             if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before')) return true;
 
@@ -47,6 +51,9 @@
             $oModuleModel = &getModel('module');
             $oModuleController = &getController('module');
 
+            // atom act 추가
+            $oModuleController->insertActionForward('rss', 'view', 'atom');
+
             // 2007. 10. 18 서비스형 모듈의 추가 설정에 참여하기 위한 trigger 추가
             if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before')) 
                 $oModuleController->insertTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before');
diff --git a/modules/rss/rss.controller.php b/modules/rss/rss.controller.php
index 225f674fc..5d27bafd7 100644
--- a/modules/rss/rss.controller.php
+++ b/modules/rss/rss.controller.php
@@ -34,6 +34,7 @@
             $rss_config = $oRssModel->getRssModuleConfig($current_module_srl);
 
             if($rss_config->open_rss != 'N') Context::set('rss_url', getUrl('','mid',Context::get('mid'),'act','rss'));
+            if($rss_config->open_rss != 'N') Context::set('atom_url', getUrl('','mid',Context::get('mid'),'act','atom'));
 
             return new Object();
         }
diff --git a/modules/rss/rss.view.php b/modules/rss/rss.view.php
index ff501b5ec..70944d98f 100644
--- a/modules/rss/rss.view.php
+++ b/modules/rss/rss.view.php
@@ -146,6 +146,11 @@
             $this->setTemplateFile('display');
         }
 
+        function atom() {
+            Context::set('format', 'atom');
+            $this->rss();
+        }
+
         /**
          * @brief 에러 출력
          **/