diff --git a/Common/make/ghdl.mk b/Common/make/ghdl.mk
index 99ff8dc..d9121a6 100644
--- a/Common/make/ghdl.mk
+++ b/Common/make/ghdl.mk
@@ -49,7 +49,7 @@ SIM_FILE-fst := $(BUILD_DIR)/$(TARGET).fst
 GTK_OPTS-fst := --fst=$(SIM_FILE-fst)
 
 SIM_FILE-ghw := $(BUILD_DIR)/$(TARGET).ghw
-GTK_OPTS-ghw := --wave=$(SIM_FILE-ghw)
+GTK_OPTS-ghw := --wave=$(SIM_FILE-ghw) --read-wave-opt=$(TARGET).wopt
 
 SIM_FILE := $(SIM_FILE-$(WAVE_FORMAT))
 GTK_OPTS := $(GTK_OPTS-$(WAVE_FORMAT))
@@ -102,7 +102,11 @@ result:
 tree: analyze
 	$(GHDL) -r $(GHDL_OPTS) $(ENTITY) $(RUN_OPTS) --no-run --disp-tree=inst
 	
-	
+genwopt: analyze
+	rm -rf $(TARGET).wopt.templ
+	$(GHDL) -r $(GHDL_OPTS) $(ENTITY) --stop-time=0ps --write-wave-opt=$(TARGET).wopt.templ --wave=$(BUILD_DIR)/$(TARGET).ghw
+
+
 .PHONY: list
 INSTR = $(foreach number,$(SRCS),echo $(number);)
 list: