diff --git a/legacy/edje/src/bin/edje_cc.c b/legacy/edje/src/bin/edje_cc.c
index f2663bec2a..4e06457424 100644
--- a/legacy/edje/src/bin/edje_cc.c
+++ b/legacy/edje/src/bin/edje_cc.c
@@ -30,6 +30,7 @@ int        no_save = 0;
 int        min_quality = 0;
 int        max_quality = 100;
 int        compress_mode = EET_COMPRESSION_DEFAULT;
+int        threads = 0;
 
 static void
 main_help(void)
@@ -55,6 +56,7 @@ main_help(void)
       "-Ddefine_val=to          CPP style define to define input macro definitions to the .edc source\n"
       "-fastcomp                Use a faster compression algorithm (LZ4) (mutually exclusive with -fastdecomp)\n"
       "-fastdecomp              Use a faster decompression algorithm (LZ4HC) (mutually exclusive with -fastcomp)\n"
+      "-threads                 Compile the edje file using multiple parallel threads\n"
       ,progname);
 }
 
@@ -147,14 +149,18 @@ main(int argc, char **argv)
 	     if (max_quality < 0) max_quality = 0;
 	     if (max_quality > 100) max_quality = 100;
 	  }
-	else if ((!strcmp(argv[i], "-fastcomp")) && (i < (argc - 1)))
+	else if (!strcmp(argv[i], "-fastcomp"))
 	  {
              compress_mode = EET_COMPRESSION_SUPERFAST;
 	  }
-	else if ((!strcmp(argv[i], "-fastdecomp")) && (i < (argc - 1)))
+	else if (!strcmp(argv[i], "-fastdecomp"))
 	  {
              compress_mode = EET_COMPRESSION_VERYFAST;
 	  }
+	else if (!strcmp(argv[i], "-threads"))
+	  {
+             threads = 1;
+	  }
 	else if (!strncmp(argv[i], "-D", 2))
 	  {
 	     defines = eina_list_append(defines, mem_strdup(argv[i]));
diff --git a/legacy/edje/src/bin/edje_cc.h b/legacy/edje/src/bin/edje_cc.h
index 35fcf5d576..5683feb933 100644
--- a/legacy/edje/src/bin/edje_cc.h
+++ b/legacy/edje/src/bin/edje_cc.h
@@ -228,5 +228,6 @@ extern Eina_List             *aliases;
 extern New_Object_Handler     object_handlers[];
 extern New_Statement_Handler  statement_handlers[];
 extern int                    compress_mode;
+extern int                    threads;
 
 #endif
diff --git a/legacy/edje/src/bin/edje_cc_out.c b/legacy/edje/src/bin/edje_cc_out.c
index b0ab4d8556..33e34be433 100644
--- a/legacy/edje/src/bin/edje_cc_out.c
+++ b/legacy/edje/src/bin/edje_cc_out.c
@@ -178,7 +178,6 @@ struct _Group_Write
 };
 
 static int pending_threads = 0;
-int threads = 1;
 
 static void data_process_string(Edje_Part_Collection *pc, const char *prefix, char *s, void (*func)(Edje_Part_Collection *pc, char *name, char* ptr, int len));