diff --git a/legacy/edje/ChangeLog b/legacy/edje/ChangeLog
index 76a8e50ea6..b59080fb7c 100644
--- a/legacy/edje/ChangeLog
+++ b/legacy/edje/ChangeLog
@@ -61,3 +61,8 @@
 
 	* Add PROXY part.
 
+2011-03-19  Carsten Haitzler (The Rasterman)
+
+	* Change edje_decc to only use edje_cc as the compiler for security
+        and correctness reasons.
+
diff --git a/legacy/edje/src/bin/edje_decc.c b/legacy/edje/src/bin/edje_decc.c
index 5735afc0d0..aeab7543a3 100644
--- a/legacy/edje/src/bin/edje_decc.c
+++ b/legacy/edje/src/bin/edje_decc.c
@@ -142,6 +142,8 @@ decomp(void)
 	eet_close(ef);
 	return 0;
      }
+   /* force compiler to be edje_cc */
+   edje_file->compiler = strdup("edje_cc");
    if (!edje_file->compiler)
      {
 	edje_file->compiler = strdup("edje_cc");