diff --git a/meson.build b/meson.build
index 9c090149fa..e2eaff9547 100644
--- a/meson.build
+++ b/meson.build
@@ -118,6 +118,7 @@ cpu_neon = false
 cpu_neon_intrinsics = false
 cpu_altivec = false
 evas_opt_c_args = [ ]
+draw_opt_c_args = [ ]
 machine_c_args = [ ]
 compiler = meson.get_compiler('c')
 
@@ -134,6 +135,7 @@ if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64'
       if (get_option('cpu-sse3') == true)
         config_h.set10('BUILD_SSE3', true)
         evas_opt_c_args += [ '-msse3' ]
+        draw_opt_c_args += [ '-msse3' ]
         cpu_sse3 = true
         message('x86 build - SSE3 enabled')
       endif
diff --git a/src/static_libs/draw/meson.build b/src/static_libs/draw/meson.build
index 1fcc6b1ba8..54c72160d2 100644
--- a/src/static_libs/draw/meson.build
+++ b/src/static_libs/draw/meson.build
@@ -1,6 +1,5 @@
 
 draw_src = [
-  'draw_main_sse2.c',
   'draw_main.c',
   'draw_main_neon.c',
   'draw_main.c',
@@ -8,12 +7,26 @@ draw_src = [
   'draw_alpha_main.c'
 ]
 
+draw_opt_lib = [ ]
+
+if cpu_sse3 == true
+  draw_opt = static_library('draw_opt',
+    sources: [ 'draw_main_sse2.c' ],
+    include_directories: config_dir + [include_directories(join_paths('..', '..', 'lib'))],
+    c_args: draw_opt_c_args,
+    dependencies : [eina, efl]
+  )
+  draw_opt_lib += [ draw_opt ]
+else
+  draw_src += [ 'draw_main_sse2.c' ]
+endif
 
 draw_lib = static_library('draw',
     draw_src,
     dependencies : [eina, efl],
     include_directories : config_dir + [include_directories(join_paths('..', '..', 'lib'))],
     install: false,
+    link_with: draw_opt_lib,
 )
 
 draw = declare_dependency(