diff --git a/CMakeModules/wasm.cmake b/CMakeModules/wasm.cmake
index 8269c975089b6df5c99730535d5fd12896875606..4e75bde9a485f376eb66c4cdf040f39cf4eac7b8 100644
--- a/CMakeModules/wasm.cmake
+++ b/CMakeModules/wasm.cmake
@@ -157,6 +157,16 @@ macro(add_wast_executable)
     VERBATIM
   )
   set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${target}.wast)
+
+  add_custom_command(OUTPUT ${DESTINATION_FOLDER}/${target}.wasm
+    DEPENDS ${target}.wast
+    COMMAND $<TARGET_FILE:eosio-wast2wasm> ${DESTINATION_FOLDER}/${target}.wast ${DESTINATION_FOLDER}/${target}.wasm -n
+    COMMENT "Generating WASM ${target}.wasm"
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    VERBATIM
+  )
+  set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${target}.wasm)
+
   STRING (REPLACE "." "_" TARGET_VARIABLE "${target}")
 
   add_custom_command(OUTPUT ${DESTINATION_FOLDER}/${target}.wast.hpp
@@ -183,6 +193,7 @@ macro(add_wast_executable)
   endif()
   
   add_custom_target(${target} ALL DEPENDS ${DESTINATION_FOLDER}/${target}.wast.hpp ${extra_target_dependency})
+  add_custom_target(${target}_wasm ALL DEPENDS ${DESTINATION_FOLDER}/${target}.wasm)
   
   set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${DESTINATION_FOLDER}/${target}.wast.hpp)