diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 51f6e844f0..33825c69ba 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -771,3 +771,4 @@
 2012-12-06  Cedric Bail
 
 	* Fix possible segv in elm_quicklaunch infrastructure.
+	* Fix elm_conform buffer to always finish with at least one '\0';
diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index 1c0467d1dd..fe9768705c 100644
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -77,6 +77,7 @@ Fixes:
    * Fix uninitialized data path in elm_flip, elm_gesture_layer, elm_interface_scrollable,
    els_scroller.
    * Fix possible segv in elm_quicklaunch infrastructure.
+   * Fix buffer to always have a final '\0' in elm_conform.
 
 Removals:
 
diff --git a/legacy/elementary/src/lib/elm_conform.c b/legacy/elementary/src/lib/elm_conform.c
index 69372f5fbe..54345fc28a 100644
--- a/legacy/elementary/src/lib/elm_conform.c
+++ b/legacy/elementary/src/lib/elm_conform.c
@@ -64,6 +64,7 @@ _conformant_part_geometry_get_from_env(const char *part,
 
    /* strtok would modify env var if not copied to a buffer */
    strncpy(buf, env_val, sizeof(buf));
+   buf[PATH_MAX - 1] = '\0';
 
    token = strtok(buf, delimiters);
    if (!token) return EINA_FALSE;