diff --git a/modules/module/queries/updateModule.xml b/modules/module/queries/updateModule.xml
index 125cc8845..0dd94250d 100644
--- a/modules/module/queries/updateModule.xml
+++ b/modules/module/queries/updateModule.xml
@@ -5,7 +5,7 @@
   <columns>
     <column name="mid" var="mid" notnull="notnull" minlength="1" maxlength="40"/>
     <column name="module_category_srl" var="module_category_srl" />
-    <column name="skin" var="skin" notnull="notnull" minlength="1" maxlength="250" />
+    <column name="skin" var="skin" minlength="1" maxlength="250" />
     <column name="browser_title" var="browser_title" notnull="notnull" minlength="1" maxlength="250" />
     <column name="description" var="description" />
     <column name="content" var="content" />
diff --git a/modules/pagemaker/lang/ko.lang.php b/modules/pagemaker/lang/ko.lang.php
index cf4c7b1d7..7634b0635 100644
--- a/modules/pagemaker/lang/ko.lang.php
+++ b/modules/pagemaker/lang/ko.lang.php
@@ -4,4 +4,11 @@
      * @author zero <zero@nzeo.com>
      * @brief  페이지생성기 (pagemaker) 모듈의 기본 언어팩
      **/
+    $lang->about_mid = "모듈이름은 http://주소/?mid=모듈이름 처럼 직접 호출할 수 있는 값입니다. (영문+숫자만 가능)";
+    $lang->about_category = "분류를 통한 관리를 할 수 있도록 합니다. 모듈 분류의 관리는 <a href=\"./?module=admin&amp;act=dispCategory&amp;mo=module\">모듈관리 > 모듈카테고리</a>에서 하실 수 있습니다.";
+    $lang->about_browser_title = "브라우저의 제목에 나타나는 값입니다. RSS/Trackback에서도 사용됩니다.";
+    $lang->about_default = "선택하시면 사이트에 mid값 없이 접속하였을 경우 기본으로 보여줍니다";
+
+    $lang->msg_new_module = "모듈 생성";
+    $lang->msg_update_module = "모듈 수정";
 ?>
diff --git a/modules/pagemaker/pagemaker.controller.php b/modules/pagemaker/pagemaker.controller.php
index bcbbc23ae..507fe4515 100644
--- a/modules/pagemaker/pagemaker.controller.php
+++ b/modules/pagemaker/pagemaker.controller.php
@@ -50,6 +50,8 @@
 
             if(!$output->toBool()) return $output;
 
+            $this->add("module_srl", $args->module_srl);
+            $this->add("page", Context::get('page'));
             $this->setMessage($msg_code);
         }
 
@@ -88,7 +90,7 @@
         function procUploadFile() {
             // 기본적으로 필요한 변수 설정
             $upload_target_srl = Context::get('upload_target_srl');
-            $module_srl = $this->module_srl;
+            $module_srl = Context::get('module_srl');
 
             // file class의 controller 객체 생성
             $oFileController = &getController('file');
@@ -105,7 +107,7 @@
         function procDeleteFile() {
             // 기본적으로 필요한 변수인 upload_target_srl, module_srl을 설정
             $upload_target_srl = Context::get('upload_target_srl');
-            $module_srl = $this->module_srl;
+            $module_srl = Context::get('module_srl');
             $file_srl = Context::get('file_srl');
 
             // file class의 controller 객체 생성
diff --git a/modules/pagemaker/pagemaker.view.php b/modules/pagemaker/pagemaker.view.php
index 943654864..b7c48afb6 100644
--- a/modules/pagemaker/pagemaker.view.php
+++ b/modules/pagemaker/pagemaker.view.php
@@ -91,8 +91,22 @@
             // 관리자  관련 정보 세팅
             $this->initAdmin();
 
+            // GET parameter에서 module_srl을 가져옴
+            $module_srl = Context::get('module_srl');
+
+            // module model 객체 생성 
+            if($module_srl) {
+                $oModuleModel = &getModel('module');
+                $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+                if($module_info->module_srl == $module_srl) Context::set('module_info',$module_info);
+                else {
+                    unset($module_info);
+                    unset($module_srl);
+                }
+            }
+
             // module_srl 값이 없다면 그냥 index 페이지를 보여줌
-            if(!Context::get('module_srl')) return $this->dispAdminContent();
+            if(!$module_srl) return $this->dispAdminContent();
 
             // 레이아웃이 정해져 있다면 레이아웃 정보를 추가해줌(layout_title, layout)
             if($this->module_info->layout_srl) {
@@ -131,14 +145,12 @@
                     unset($module_srl);
                 }
             }
-
             if(!$module_srl) {
                 $oDB = &DB::getInstance();
                 $module_srl = $oDB->getNextSequence();
             }
 
             Context::set('module_srl',$module_srl);
-            Context::set('module_info', $module);
 
             // 에디터 모듈의 getEditor를 호출하여 세팅
             $oEditorView = &getView('editor');
diff --git a/modules/pagemaker/tpl.admin/filter/insert_page.xml b/modules/pagemaker/tpl.admin/filter/insert_page.xml
index cc9243a51..9f0edf4bf 100644
--- a/modules/pagemaker/tpl.admin/filter/insert_page.xml
+++ b/modules/pagemaker/tpl.admin/filter/insert_page.xml
@@ -13,8 +13,10 @@
     <param name="is_default" target="is_default" />
     <param name="content" target="content" />
   </parameter>
-  <response>
+  <response callback_func="completeInsertPage">
     <tag name="error" />
     <tag name="message" />
+    <tag name="module_srl" />
+    <tag name="page" />
   </response>
 </filter>
diff --git a/modules/pagemaker/tpl.admin/index.html b/modules/pagemaker/tpl.admin/index.html
index c3246e45b..f9f7f942b 100644
--- a/modules/pagemaker/tpl.admin/index.html
+++ b/modules/pagemaker/tpl.admin/index.html
@@ -41,14 +41,14 @@
         {$module_category[$val->module_category_srl]->title}
       <!--@end-->
     </td>
-    <td><a href="{getUrl('act','dispAdminBoardInfo','module_srl',$val->module_srl)}">{$val->mid}</a></td>
+    <td><a href="{getUrl('act','dispAdminPageInfo','module_srl',$val->module_srl)}">{$val->mid}</a></td>
     <td>{$val->browser_title}</td>
     <td>{$val->is_default}</td>
     <td>{$val->skin}</td>
     <td>{$val->admin_id}</td>
     <td>{zdate($val->regdate,"Y-m-d")}</td>
     <td><a href="./?mid={$val->mid}" target="_blank">{$lang->cmd_move}</a></td>
-    <td><!--@if($val->is_default!='Y')--><a href="{getUrl('act','dispAdminDeleteBoard','module_srl', $val->module_srl)}">{$lang->cmd_delete}</a><!--@end--></td>
+    <td><!--@if($val->is_default!='Y')--><a href="{getUrl('act','dispAdminDeletePage','module_srl', $val->module_srl)}">{$lang->cmd_delete}</a><!--@end--></td>
   </tr>
   <!--@end-->
   </table>
@@ -56,7 +56,7 @@
 
 <!-- 버튼 -->
 <div>
-  [<a href="{getUrl('act','dispAdminInsertBoard','module_srl','')}">{$lang->cmd_make}</a>]
+  [<a href="{getUrl('act','dispAdminInsertPage','module_srl','')}">{$lang->cmd_make}</a>]
 </div>
 
 <!-- 페이지 네비게이션 -->
diff --git a/modules/pagemaker/tpl.admin/js/admin.js b/modules/pagemaker/tpl.admin/js/admin.js
index d980199ae..f33b6e234 100644
--- a/modules/pagemaker/tpl.admin/js/admin.js
+++ b/modules/pagemaker/tpl.admin/js/admin.js
@@ -4,6 +4,23 @@
  * @desc   : pagemaker 모듈의 관리자용 javascript
  **/
 
+/* 모듈 생성 후 */
+function completeInsertPage(ret_obj) {
+  var error = ret_obj['error'];
+  var message = ret_obj['message'];
+
+  var page = ret_obj['page'];
+  var module_srl = ret_obj['module_srl'];
+
+  alert(message);
+
+  var url =  "./?module=admin&mo=pagemaker&module_srl="+module_srl+"&act=dispAdminPageInfo";
+  if(page) url += "&page="+page;
+
+  location.href = url;
+}
+
+
 /* 모듈 삭제 후 */
 function completeDeletePage(ret_obj) {
   var error = ret_obj['error'];
diff --git a/modules/pagemaker/tpl.admin/page_info.html b/modules/pagemaker/tpl.admin/page_info.html
index e220f183f..a10d95616 100644
--- a/modules/pagemaker/tpl.admin/page_info.html
+++ b/modules/pagemaker/tpl.admin/page_info.html
@@ -57,7 +57,7 @@
 </tr>
 <tr>
   <td colspan="2">
-    <input type="button" value="{$lang->cmd_modify}" onclick="location.href='{getUrl('act','dispAdminInsertBoard')}'" />
+    <input type="button" value="{$lang->cmd_modify}" onclick="location.href='{getUrl('act','dispAdminInsertPage')}'" />
   </td>
 </tr>
 </table>
diff --git a/modules/pagemaker/tpl.admin/page_insert.html b/modules/pagemaker/tpl.admin/page_insert.html
index 6d903ab65..2a8f392a0 100644
--- a/modules/pagemaker/tpl.admin/page_insert.html
+++ b/modules/pagemaker/tpl.admin/page_insert.html
@@ -10,9 +10,10 @@
 </div>
 
 <form action="./" method="post" onsubmit="return procFilter(this, insert_page)" enctype="multipart/form-data">
+<input type="hidden" name="module" value="pagemaker" />
 <input type="hidden" name="page" value="{$page}" />
 <input type="hidden" name="module_srl" value="{$module_srl}" />
-<input type="hidden" name="content" value="{$module_info->content}" />
+<input type="hidden" name="content" value="{htmlspecialchars($module_info->content)}" />
 <!--@if($module_info->is_default=='Y')-->
 <input type="hidden" name="is_default" value="Y" />
 <!--@end-->