diff --git a/Common/make/ghdl.mk b/Common/make/ghdl.mk
index 5d3ab26..4cac921 100644
--- a/Common/make/ghdl.mk
+++ b/Common/make/ghdl.mk
@@ -7,6 +7,7 @@ GHDL := ghdl
 GHDL_GCC := ghdl-gcc
 
 RUN_OPTS := --vcd=$(BUILD_DIR)/$(NAME).vcd --wave=$(BUILD_DIR)/$(NAME).ghw --assert-level=error 
+TS := ps
 
 all:  analyze
 
@@ -14,17 +15,17 @@ $(BUILD_DIR):
 	mkdir -p $@
 	
 analyze: $(BUILD_DIR) $(SRCS)
-	$(GHDL) -a --work=$(NAME) --workdir=$(BUILD_DIR) $(SRCS)
+	$(GHDL) -a --work=$(NAME) --workdir=$(BUILD_DIR) --time-resolution=$(TS) $(SRCS)
 	
 anaborate: $(BUILD_DIR) $(SRCS)
 	$(GHDL_GCC) -c -o $(BUILD_DIR)/$(NAME) --work=$(NAME) --workdir=$(BUILD_DIR) $(SRCS) -e $(ENTITY_RUN)
 	-$(BUILD_DIR)/$(NAME) $(RUN_OPTS) >$(BUILD_DIR)/$(NAME).log
 	
 run: analyze
-	-$(GHDL) -r --work=$(NAME) --workdir=$(BUILD_DIR) $(ENTITY_RUN) $(RUN_OPTS) >$(BUILD_DIR)/$(NAME).log
+	-$(GHDL) -r --work=$(NAME) --workdir=$(BUILD_DIR) --time-resolution=$(TS) $(ENTITY_RUN) $(RUN_OPTS) >$(BUILD_DIR)/$(NAME).log
 	
 sim: run
-	exec gtkwave -f $(BUILD_DIR)/$(NAME).ghw &
+	exec gtkwave -f $(BUILD_DIR)/$(NAME).vcd &
 	
 synth: analyze
 	$(GHDL) --synth --work=$(NAME) --workdir=$(BUILD_DIR) $(ENTITY_SYN)