diff --git a/CMakeLists.txt b/CMakeLists.txt
index 100351184..76e27b7e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -320,7 +320,9 @@ if (OPENFPGA_WITH_YOSYS)
     else ()
         # run makefile provided, we pass-on the options to the local make file 
         add_custom_target(
-            yosys ALL 
+            yosys ALL
+            # add step to remove the 'built-in' quicklogic plugins code in yosys
+            COMMAND rm -rf techlibs/quicklogic
             COMMAND $(MAKE) config-gcc
             COMMAND $(MAKE) install PREFIX=${CMAKE_CURRENT_BINARY_DIR}/yosys/
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/yosys
diff --git a/yosys b/yosys
index 8bd681acf..8649e3066 160000
--- a/yosys
+++ b/yosys
@@ -1 +1 @@
-Subproject commit 8bd681acfc3b0913e57f6312ed357b2334cf19cb
+Subproject commit 8649e306682e44b7f3e1b869d1043041db00b13e