diff --git a/ChangeLog b/ChangeLog
index 4a089a424c..113c1b75a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-27  Jihoon Kim (jihoon)
+
+        * Add ECORE_IMF_INPUT_PANEL_LAYOUT_DATETIME layout
+        * Add EDJE_INPUT_PANEL_LAYOUT_DATETIME layout
+
 2013-05-24  Daniel Willmann
         * Fix srv->start_time (initialization missing). So now 
           ecore_con_server_uptime_get() is working for plain TCP connections.
diff --git a/NEWS b/NEWS
index a5a1f644cd..29ba2369df 100644
--- a/NEWS
+++ b/NEWS
@@ -97,7 +97,10 @@ Additions:
      - Add ecore_imf_context_input_panel_layout_variation_set/get API
      - Add ecore_imf_input_panel_hide API
      - Add ecore_imf_context_input_panel_event_callback_call, clear API
-    * Add edje_object_part_text_input_panel_layout_variation_set/get API
+     - Add ECORE_IMF_INPUT_PANEL_LAYOUT_DATETIME layout
+    * Edje:
+     - Add edje_object_part_text_input_panel_layout_variation_set/get API
+     - Add EDJE_INPUT_PANEL_LAYOUT_DATETIME layout
     * Evil:
      - Add mkdtemp.
     * ecore_x:
diff --git a/src/lib/ecore_imf/Ecore_IMF.h b/src/lib/ecore_imf/Ecore_IMF.h
index 7e740c7d60..842b8fca3c 100644
--- a/src/lib/ecore_imf/Ecore_IMF.h
+++ b/src/lib/ecore_imf/Ecore_IMF.h
@@ -263,7 +263,8 @@ typedef enum
    ECORE_IMF_INPUT_PANEL_LAYOUT_INVALID,         /**< Never use this */
    ECORE_IMF_INPUT_PANEL_LAYOUT_HEX,             /**< Hexadecimal layout @since 1.2 */
    ECORE_IMF_INPUT_PANEL_LAYOUT_TERMINAL,        /**< Command-line terminal layout including ESC, Alt, Ctrl key, so on (no auto-correct, no auto-capitalization) @since 1.2 */
-   ECORE_IMF_INPUT_PANEL_LAYOUT_PASSWORD         /**< Like normal, but no auto-correct, no auto-capitalization etc. @since 1.2 */
+   ECORE_IMF_INPUT_PANEL_LAYOUT_PASSWORD,        /**< Like normal, but no auto-correct, no auto-capitalization etc. @since 1.2 */
+   ECORE_IMF_INPUT_PANEL_LAYOUT_DATETIME         /**< Date and time layout @since 1.8 */
 } Ecore_IMF_Input_Panel_Layout;
 
 /**
diff --git a/src/lib/edje/Edje_Common.h b/src/lib/edje/Edje_Common.h
index 751248499c..58ef0fa4c3 100644
--- a/src/lib/edje/Edje_Common.h
+++ b/src/lib/edje/Edje_Common.h
@@ -981,7 +981,8 @@ typedef enum _Edje_Input_Panel_Layout
    EDJE_INPUT_PANEL_LAYOUT_INVALID,         /**< Never use this */
    EDJE_INPUT_PANEL_LAYOUT_HEX,             /**< Hexadecimal layout @since 1.2 */
    EDJE_INPUT_PANEL_LAYOUT_TERMINAL,        /**< Command-line terminal layout including esc, alt, ctrl key, so on (no auto-correct, no auto-capitalization) @since 1.2 */
-   EDJE_INPUT_PANEL_LAYOUT_PASSWORD         /**< Like normal, but no auto-correct, no auto-capitalization etc. @since 1.2 */
+   EDJE_INPUT_PANEL_LAYOUT_PASSWORD,        /**< Like normal, but no auto-correct, no auto-capitalization etc. @since 1.2 */
+   EDJE_INPUT_PANEL_LAYOUT_DATETIME         /**< Date and time layout @since 1.8 */
 } Edje_Input_Panel_Layout;
 
 enum