diff --git a/legacy/edje/ChangeLog b/legacy/edje/ChangeLog
index e92088c18e..107fc1236e 100644
--- a/legacy/edje/ChangeLog
+++ b/legacy/edje/ChangeLog
@@ -475,3 +475,10 @@
 2012-06-04  Cedric Bail
 
 	* Add SPACER part to reduce the load on the canvas (lighter and faster theme).
+
+2012-06-04  Prince Kumar Dubey
+
+	* Fix decompile of sound samples to use sound source file, not name
+	* Fix decompile of sound samples not double-free
+        * Fix alsa configure option to be alsa, not flac.
+
diff --git a/legacy/edje/configure.ac b/legacy/edje/configure.ac
index 9b7322bc03..de135c342e 100644
--- a/legacy/edje/configure.ac
+++ b/legacy/edje/configure.ac
@@ -396,7 +396,7 @@ fi
 ##alsa library
 have_alsa_lib="no"
 want_alsa_lib="auto"
-AC_ARG_ENABLE([flac],
+AC_ARG_ENABLE([alsa],
    [AC_HELP_STRING([--disable-alsa], [disable alsa support. @<:@default=detect@:>@])],
    [want_alsa_lib=$enableval], [])
 
diff --git a/legacy/edje/src/bin/edje_decc.c b/legacy/edje/src/bin/edje_decc.c
index fd228d7b34..358859e1ef 100644
--- a/legacy/edje/src/bin/edje_decc.c
+++ b/legacy/edje/src/bin/edje_decc.c
@@ -393,7 +393,7 @@ output(void)
              sound_data = (void *)eet_read_direct(tef, out, &sound_data_size);
              if (sound_data)
                {
-                  snprintf(out1, sizeof(out1), "%s/%s", outdir, sample->name);
+                  snprintf(out1, sizeof(out1), "%s/%s", outdir, sample->snd_src);
                   pp = strdup(out1);
                   p = strrchr(pp, '/');
                   *p = 0;
@@ -413,7 +413,6 @@ output(void)
                   if (fwrite(sound_data, sound_data_size, 1, f) != 1)
                     ERR("Could not write sound: %s", strerror(errno));
                   fclose(f);
-                  free(sound_data);
               }
           }