diff --git a/common/lang/en.php b/common/lang/en.php
index 7b4343e1f..60dcb24f6 100644
--- a/common/lang/en.php
+++ b/common/lang/en.php
@@ -165,6 +165,8 @@ $lang->first_page = 'First Page';
 $lang->last_page = 'Last Page';
 $lang->search_target = 'Target for Search';
 $lang->search_keyword = 'Keyword';
+$lang->meta_keywords = 'SEO Keywords';
+$lang->meta_description = 'SEO Description';
 $lang->is_default = 'Default';
 $lang->no_documents = 'No Articles';
 $lang->board_manager = 'Board Settings';
diff --git a/common/lang/ko.php b/common/lang/ko.php
index ca37fe186..33e922dcd 100644
--- a/common/lang/ko.php
+++ b/common/lang/ko.php
@@ -165,6 +165,8 @@ $lang->first_page = '첫 페이지';
 $lang->last_page = '끝 페이지';
 $lang->search_target = '검색대상';
 $lang->search_keyword = '검색어';
+$lang->meta_keywords = 'SEO 키워드';
+$lang->meta_description = 'SEO 설명';
 $lang->is_default = '기본';
 $lang->no_documents = '등록된 글이 없습니다.';
 $lang->board_manager = '게시판 관리';
diff --git a/modules/board/board.admin.controller.php b/modules/board/board.admin.controller.php
index 9218bcee3..dfe68ab91 100644
--- a/modules/board/board.admin.controller.php
+++ b/modules/board/board.admin.controller.php
@@ -49,6 +49,10 @@ class boardAdminController extends board {
 		if($args->protect_content!= 'Y') $args->protect_content = 'N';
 		if(!in_array($args->order_target,$this->order_target) && !array_key_exists($args->order_target, $extra_order_target)) $args->order_target = 'list_order';
 		if(!in_array($args->order_type, array('asc', 'desc'))) $args->order_type = 'asc';
+		
+		$args->browser_title = trim(utf8_normalize_spaces($args->browser_title));
+		$args->meta_keywords = $args->meta_keywords ? implode(', ', array_map('trim', explode(',', $args->meta_keywords))) : '';
+		$args->meta_description = trim(utf8_normalize_spaces($args->meta_description));
 
 		// if there is an existed module
 		if($args->module_srl) {
diff --git a/modules/board/tpl/board_insert.html b/modules/board/tpl/board_insert.html
index d7b3ae8da..39a4ab1b3 100644
--- a/modules/board/tpl/board_insert.html
+++ b/modules/board/tpl/board_insert.html
@@ -29,6 +29,18 @@
 				<p id="browser_title_help" class="x_help-block" hidden>{$lang->about_browser_title}</p>
 			</div>
 		</div>
+		<div class="x_control-group">
+			<label class="x_control-label" for="lang_meta_keywords">{$lang->meta_keywords}</label>
+			<div class="x_controls">
+				<input type="text" name="meta_keywords" id="meta_keywords" value="<!--@if(strpos($module_info->meta_keywords, '$user_lang->') === false)-->{$module_info->meta_keywords}<!--@else-->{htmlspecialchars($module_info->meta_keywords)}<!--@end-->" class="lang_code" />
+			</div>
+		</div>
+		<div class="x_control-group">
+			<label class="x_control-label" for="lang_meta_description">{$lang->meta_description}</label>
+			<div class="x_controls">
+				<input type="text" name="meta_description" id="meta_description" value="<!--@if(strpos($module_info->meta_description, '$user_lang->') === false)-->{$module_info->meta_description}<!--@else-->{htmlspecialchars($module_info->meta_description)}<!--@end-->" class="lang_code" />
+			</div>
+		</div>
 		<div class="x_control-group">
 			<label class="x_control-label" for="layout_srl">{$lang->layout}</label>
 			<div class="x_controls">
diff --git a/modules/page/page.admin.controller.php b/modules/page/page.admin.controller.php
index 5255b972a..9e130dcd6 100644
--- a/modules/page/page.admin.controller.php
+++ b/modules/page/page.admin.controller.php
@@ -31,6 +31,10 @@ class pageAdminController extends page
 		unset($args->page_name);
 
 		if($args->use_mobile != 'Y') $args->use_mobile = '';
+		$args->browser_title = trim(utf8_normalize_spaces($args->browser_title));
+		$args->meta_keywords = $args->meta_keywords ? implode(', ', array_map('trim', explode(',', $args->meta_keywords))) : '';
+		$args->meta_description = trim(utf8_normalize_spaces($args->meta_description));
+		
 		// Check if an original module exists by using module_srl
 		if($args->module_srl)
 		{
diff --git a/modules/page/tpl/page_info.html b/modules/page/tpl/page_info.html
index c61bb5298..c64ec02c8 100644
--- a/modules/page/tpl/page_info.html
+++ b/modules/page/tpl/page_info.html
@@ -39,6 +39,18 @@
 			<input type="text" name="browser_title" id="browser_title" value="<!--@if(strpos($module_info->browser_title, '$user_lang->') === false)-->{$module_info->browser_title}<!--@else-->{htmlspecialchars($module_info->browser_title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}<!--@end-->" class="lang_code" />
 		</div>
 	</div>
+	<div class="x_control-group">
+		<label class="x_control-label" for="lang_meta_keywords">{$lang->meta_keywords}</label>
+		<div class="x_controls">
+			<input type="text" name="meta_keywords" id="meta_keywords" value="<!--@if(strpos($module_info->meta_keywords, '$user_lang->') === false)-->{$module_info->meta_keywords}<!--@else-->{htmlspecialchars($module_info->meta_keywords)}<!--@end-->" class="lang_code" />
+		</div>
+	</div>
+	<div class="x_control-group">
+		<label class="x_control-label" for="lang_meta_description">{$lang->meta_description}</label>
+		<div class="x_controls">
+			<input type="text" name="meta_description" id="meta_description" value="<!--@if(strpos($module_info->meta_description, '$user_lang->') === false)-->{$module_info->meta_description}<!--@else-->{htmlspecialchars($module_info->meta_description)}<!--@end-->" class="lang_code" />
+		</div>
+	</div>
 	<div class="x_control-group">
 		<label class="x_control-label" for="layout_srl">{$lang->layout}</label>
 		<div class="x_controls">