diff --git a/addons/autolink/autolink.addon.php b/addons/autolink/autolink.addon.php
new file mode 100644
index 000000000..df1eff0f9
--- /dev/null
+++ b/addons/autolink/autolink.addon.php
@@ -0,0 +1,12 @@
+<?php
+    if(!defined("__ZBXE__")) exit();
+
+    /**
+     * @file autolink.addon.php
+     * @author zero (zero@nzeo.com)
+     * @brief 자동 링크 애드온
+     **/
+    if($called_position == 'after_module_proc' && Context::getResponseMethod()!="XMLRPC") {
+        Context::addJsFile('./addons/autolink/autolink.js');
+    }
+?>
diff --git a/addons/autolink/autolink.js b/addons/autolink/autolink.js
new file mode 100644
index 000000000..59e5dc43d
--- /dev/null
+++ b/addons/autolink/autolink.js
@@ -0,0 +1,36 @@
+
+jQuery(function($) {
+    var url_regx = /((http|https|ftp|news|telnet|irc):\/\/(([0-9a-z\-._~!$&'\(\)*+,;=:]|(%[0-9a-f]{2}))*\@)?((\[(((([0-9a-f]{1,4}:){6}([0-9a-f]{1,4}:[0-9a-f]{1,4})|(([0-9]|([1-9][0-9])|(1[0-9][0-9])|(2[0-4][0-9])|(25[0-5])){3}[0-9]|([1-9][0-9])|(1[0-9][0-9])|(2[0-4][0-9])|(25[0-5])))|(::([0-9a-f]{1,4}:){5}([0-9a-f]{1,4}:[0-9a-f]{1,4})|(([0-9]|([1-9][0-9])|(1[0-9][0-9])|(2[0-4][0-9])|(25[0-5])){3}[0-9]|([1-9][0-9])|(1[0-9][0-9])|(2[0-4][0-9])|(25[0-5])))|(([0-9a-f]{1,4})?::([0-9a-f]{1,4}:){4}([0-9a-f]{1,4}:[0-9a-f]{1,4})|(([0-9]|([1-9][0-9])|(1[0-9][0-9])|(2[0-4][0-9])|(25[0-5])){3}[0-9]|([1-9][0-9])|(1[0-9][0-9])|(2[0-4][0-9])|(25[0-5])))|((([0-9a-f]{1,4}:)?[0-9a-f]{1,4})?::([0-9a-f]{1,4}:){3}([0-9a-f]{1,4}:[0-9a-f]{1,4})|(([0-9]|([1-9][0-9])|(1[0-9][0-9])|(2[0-4][0-9])|(25[0-5])){3}[0-9]|([1-9][0-9])|(1[0-9][0-9])|(2[0-4][0-9])|(25[0-5])))|((([0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::([0-9a-f]{1,4}:){2}([0-9a-f]{1,4}:[0-9a-f]{1,4})|(([0-9]|([1-9][0-9])|(1[0-9][0-9])|(2[0-4][0-9])|(25[0-5])){3}[0-9]|([1-9][0-9])|(1[0-9][0-9])|(2[0-4][0-9])|(25[0-5])))|((([0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:([0-9a-f]{1,4}:[0-9a-f]{1,4})|(([0-9]|([1-9][0-9])|(1[0-9][0-9])|(2[0-4][0-9])|(25[0-5])){3}[0-9]|([1-9][0-9])|(1[0-9][0-9])|(2[0-4][0-9])|(25[0-5])))|((([0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::([0-9a-f]{1,4}:[0-9a-f]{1,4})|(([0-9]|([1-9][0-9])|(1[0-9][0-9])|(2[0-4][0-9])|(25[0-5])){3}[0-9]|([1-9][0-9])|(1[0-9][0-9])|(2[0-4][0-9])|(25[0-5])))|((([0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4})|((([0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::))|(v[0-9a-f]+.[0-9a-z\-._~!$&'\(\)*+,;=:]+))\])|(([0-9]|([1-9][0-9])|(1[0-9][0-9])|(2[0-4][0-9])|(25[0-5])){3}[0-9]|([1-9][0-9])|(1[0-9][0-9])|(2[0-4][0-9])|(25[0-5]))|(([0-9a-z\-._~!$&'\(\)*+,;=]|(%[0-9a-f]{2}))+))(:[0-9]*)?(\/([0-9a-z\-._~!$&'\(\)*+,;=:@]|(%[0-9a-f]{2}))*)*(\?([0-9a-z\-._~!$&'\(\)*+,;=:@\/\?]|(%[0-9a-f]{2}))*)?(#([0-9a-z\-._~!$&'\(\)*+,;=:@\/\?]|(%[0-9a-f]{2}))*)?)/i;
+
+    function replaceHrefLink(obj) {
+        var obj_list = obj.childNodes;
+
+        for(var i = 0; i < obj_list.length; ++i) {
+            var obj = obj_list[i];
+            var pObj = obj.parentNode;
+            if(!pObj) continue;
+
+            var pN = pObj.nodeName.toLowerCase();
+            if($.inArray(pN, ['a', 'pre', 'xml', 'textarea', 'input', 'select', 'option', 'code', 'script', 'style']) != -1) continue;
+
+            if(obj.nodeType == 3 && obj.length >= 10) {
+                var content = obj.nodeValue;
+                if(!/(http|https|ftp|news|telnet|irc):\/\//i.test(content)) continue;
+
+                content = content.replace(/</g, '&lt;');
+                content = content.replace(/>/g, '&gt;');
+                content = content.replace(url_regx, '<a href="$1" onclick="window.open(this.href); return false;">$1</a>');
+
+                $(obj).replaceWith(content);
+                delete(content);
+
+            } else if(obj.nodeType == 1 && obj.childNodes.length) {
+                replaceHrefLink(obj);
+            }
+        }
+    }
+
+    $('.xe_content').each(function() {
+        replaceHrefLink(this);
+    });
+});
diff --git a/addons/autolink/conf/info.xml b/addons/autolink/conf/info.xml
new file mode 100644
index 000000000..4b761de4a
--- /dev/null
+++ b/addons/autolink/conf/info.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon version="0.2">
+    <title xml:lang="ko">자동 링크 애드온</title>
+    <title xml:lang="jp">自動リンクアドオン</title>
+    <title xml:lang="en">Auto Link</title>
+    <title xml:lang="zh-CN">自动链接插件</title>
+    <title xml:lang="es">auto vínculo addon</title>
+    <title xml:lang="ru">авто ссылка аддон</title>
+    <title xml:lang="ge">Auto-Link Addon</title>
+    <title xml:lang="zh-TW">自動連結</title>
+    <description xml:lang="ko">
+        글과 댓글의 내용 중 URL 문자열에 링크를 걸어주는 애드온입니다.
+    </description>
+    <description xml:lang="jp">
+        書き込み本文とコメントに登録された内容の中、httpで始まる一般文字列に自動にリンクを貼り付け、そのリンクにマウスオーバすると、別ウィンドウ、または同一ウィンドウに開くメニュが現れるアドオンです。
+    </description>
+    <description xml:lang="en">
+        This addon makes a link to a string that starts with http.
+    </description>
+    <description xml:lang="zh-CN">
+        主题及评论中以http开始的字符串，自动转换为链接。并且鼠标移到链接上方时，将出现可选(新窗/本页面)提示框。
+    </description>
+    <description xml:lang="es">
+        Los comentarios que comienzan con http naeyongjung tema común de la cadena para vincular automáticamente a colgar el puntero del ratón sobre cada uno de los vínculos y saechang Ciudad y aparecen en el menú de add-on de decoración.
+    </description>
+    <description xml:lang="ru">
+        Комментарии, которые начинаются с http naeyongjung темой общей строки автоматически ссылку повесить мышь над каждой ссылке и saechang Сити и появляться на меню добавить-на украшения.
+    </description>
+    <description xml:lang="ge">
+        Kommentare beginnen mit http naeyongjung Thema der gemeinsamen String automatisch Link zu hängen Sie mit der Maus über die einzelnen Links und saechang Stadt und auf dem Menü des Add-On Dekoration.
+    </description>
+    <description xml:lang="zh-TW">
+        是種可將主題和評論內容中的URL網址字串自動轉換成連結的附加元件。
+    </description>
+    <version>0.1</version>
+    <date>2008-04-22</date>
+
+    <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
+        <name xml:lang="ko">zero</name>
+        <name xml:lang="jp">zero</name>
+        <name xml:lang="en">zero</name>
+        <name xml:lang="zh-CN">zero</name>
+        <name xml:lang="es">zero</name>
+        <name xml:lang="ru">zero</name>
+        <name xml:lang="ge">zero</name>
+        <name xml:lang="zh-TW">zero</name>
+    </author>
+</addon>
\ No newline at end of file