diff --git a/modules/board/tpl/board_insert.html b/modules/board/tpl/board_insert.html
index 4bef5990a..81909b4d4 100644
--- a/modules/board/tpl/board_insert.html
+++ b/modules/board/tpl/board_insert.html
@@ -245,4 +245,4 @@
     <!--@end-->
 
 
-</form>
\ No newline at end of file
+</form>
diff --git a/modules/planet/planet.admin.controller.php b/modules/planet/planet.admin.controller.php
index b0c6ef926..41190c14b 100644
--- a/modules/planet/planet.admin.controller.php
+++ b/modules/planet/planet.admin.controller.php
@@ -31,6 +31,7 @@
             $args->browser_title = Context::get('browser_title');
             $args->is_default = Context::get('is_default');
             $args->skin = Context::get('planet_default_skin');
+            $args->layout_srl = Context::get('layout_srl');
 
             $args->module = 'planet';
             $args->module_srl = $is_registed?$config->module_srl:getNextSequence();
diff --git a/modules/planet/planet.admin.view.php b/modules/planet/planet.admin.view.php
index b41aa6c64..0c96a05c8 100644
--- a/modules/planet/planet.admin.view.php
+++ b/modules/planet/planet.admin.view.php
@@ -37,6 +37,11 @@
             if(is_array($this->config->tagtab_after)) Context::set('tagtab_after', join(',',$this->config->tagtab_after));
             if(is_array($this->config->smstag)) Context::set('smstag', join(',',$this->config->smstag));
 
+            // 레이아웃 목록을 구해옴
+            $oLayoutMode = &getModel('layout');
+            $layout_list = $oLayoutMode->getLayoutList();
+            Context::set('layout_list', $layout_list);
+
 
             $this->setTemplateFile('setup');
         }
diff --git a/modules/planet/planet.view.php b/modules/planet/planet.view.php
index aa642687e..6abae37df 100644
--- a/modules/planet/planet.view.php
+++ b/modules/planet/planet.view.php
@@ -42,7 +42,7 @@
             $this->grant->create = $oPlanetModel->isCreateGranted();
 
             // 플래닛은 별도 레이아웃 동작하지 않도록 변경
-            Context::set('layout', 'none');
+            //Context::set('layout', 'none');
             if(!Context::get('mid')) Context::set('mid', $this->config->mid, true);
         }
 
diff --git a/modules/planet/tpl/filter/insert_config.xml b/modules/planet/tpl/filter/insert_config.xml
index e477e1a97..0c997fa5a 100644
--- a/modules/planet/tpl/filter/insert_config.xml
+++ b/modules/planet/tpl/filter/insert_config.xml
@@ -11,6 +11,7 @@
         <param name="is_default" target="is_default" />
         <param name="use_signup" target="use_signup" />
         <param name="planet_default_skin" target="planet_default_skin" />
+        <param name="layout_srl" target="layout_srl" />
         <param name="access" target="access" />
         <param name="create" target="create" />
         <param name="manager" target="manager" />
diff --git a/modules/planet/tpl/setup.html b/modules/planet/tpl/setup.html
index 5a5b2c587..e23d260a2 100644
--- a/modules/planet/tpl/setup.html
+++ b/modules/planet/tpl/setup.html
@@ -17,13 +17,25 @@
             <label for="fld_for_default">{$lang->about_default}</label>
         </td>
     </tr>
-    <tr>
+    <tr class="row2">
         <th scope="row"><div>{$lang->browser_title}</div></th>
         <td colspan="3">
             <input type="text" name="browser_title" value="{htmlspecialchars($config->browser_title)}"  class="inputTypeText w400" />
             <p>{$lang->browser_title}</p>
         </td>
     </tr>
+    <tr class="row">
+        <th scope="row"><div>{$lang->layout}</div></th>
+        <td colspan="3">
+            <select name="layout_srl">
+            <option value="0">{$lang->notuse}</option>
+            <!--@foreach($layout_list as $key => $val)-->
+            <option value="{$val->layout_srl}" <!--@if($module_info->layout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
+            <!--@end-->
+            </select>
+            <p>{$lang->about_layout}</p>
+        </td>
+    </tr>
     <tr class="row2">
         <th scope="row"><div>{$lang->planet_default_skin}</div></th>
         <td colspan="3">