diff --git a/AUTHORS b/AUTHORS
index c1c1ee953e..27b13c7435 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -183,6 +183,7 @@ Yakov Goldberg <yakov.g@samsung.com>
 Eduardo Lima (Etrunko) <eblima@gmail.com>
 Alexey Yakovenko <wakeroid@gmail.com>
 Myoungwoon Roy Kim(roy_kim) <myoungwoon.kim@samsung.com> <myoungwoon@gmail.com>
+Robert David <robert.david.public@gmail.com>
 
 Embryo
 ------
diff --git a/ChangeLog b/ChangeLog
index e3b698ac9e..b4bd2e9982 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -108,3 +108,8 @@
 2012-11-20  ChunEon Park (Hermet)
 
         * Fix the evas memory leak - eina_rectangles allocated internally.
+
+2012-12-05  Cedric Bail
+
+	* Fix build of Ecore_Evas_Extn on Solaris 11.
+
diff --git a/NEWS b/NEWS
index b76af1d1b3..b0f87aae5c 100644
--- a/NEWS
+++ b/NEWS
@@ -29,3 +29,4 @@ Fixes:
       to properly handle GL_SCISSOR_BOX and GL_VIEWPORT parameters.
     * Fixed textblock textprop leak.
     * Fixed evas_object_box to reset size_hint_min to zero when no child.
+    * Fix build of Ecore_Evas_Extn on Solaris.
\ No newline at end of file
diff --git a/src/lib/ecore_evas/ecore_evas_extn.c b/src/lib/ecore_evas/ecore_evas_extn.c
index 2e1dac5cf8..61840723c7 100644
--- a/src/lib/ecore_evas/ecore_evas_extn.c
+++ b/src/lib/ecore_evas/ecore_evas_extn.c
@@ -442,7 +442,7 @@ _ecore_evas_socket_lock(Ecore_Evas *ee)
    if (extn->file.have_lock) return;
    extn->file.have_lock = EINA_TRUE;
    if (_ecore_evas_lock_other_have(ee)) return;
-   flock(extn->file.lockfd, LOCK_EX);
+   lockf(extn->file.lockfd, F_ULOCK, 0);
    extn->file.have_real_lock = EINA_TRUE;
 }
 
@@ -457,7 +457,7 @@ _ecore_evas_socket_unlock(Ecore_Evas *ee)
    if (!extn->file.have_lock) return;
    extn->file.have_lock = EINA_FALSE;
    if (!extn->file.have_real_lock) return;
-   flock(extn->file.lockfd, LOCK_UN);
+   lockf(extn->file.lockfd, F_ULOCK, 0);
 }
 
 static void