diff --git a/lib/CPUs/JCpu/ghdl/cpu_embedded_with_uart.gtkw b/lib/CPUs/JCpu/ghdl/cpu_embedded_with_uart.gtkw
new file mode 100644
index 0000000..e69de29
diff --git a/lib/CPUs/JCpu/ghdl/cpu_embedded_with_uart.make b/lib/CPUs/JCpu/ghdl/cpu_embedded_with_uart.make
new file mode 100644
index 0000000..ca1c114
--- /dev/null
+++ b/lib/CPUs/JCpu/ghdl/cpu_embedded_with_uart.make
@@ -0,0 +1,20 @@
+# -----------------------------------------------------------
+include $(VHDL_HOME)/make/defs.mk
+# -----------------------------------------------------------
+include $(VHDL_HOME)/lib/uart/ghdl/uart_sim.inc
+include jcpu_core.inc
+
+SRCS += $(UART_SIM_SRCS)
+SRCS += $(JCPU_CORE_SRCS)
+SRCS += ../src/hallo_welt_uart_irom.vhdl
+SRCS += ../src/hallo_welt_uart_xrom.vhdl
+SRCS += ../src/cpu_embedded_with_uart.vhd
+SRCS += ../src/tb_cpu_embedded_with_uart.vhd
+
+# Compile
+TARGET := tb_cpu_embedded_with_uart
+ENTITY := tb_cpu_embedded_with_uart
+RUN_TIME := 100us
+
+include $(VHDL_HOME)/make/ghdl.mk
+
diff --git a/lib/CPUs/JCpu/ghdl/tb_cpu_embedded_with_uart.gtkw b/lib/CPUs/JCpu/ghdl/tb_cpu_embedded_with_uart.gtkw
new file mode 100644
index 0000000..00a9fac
--- /dev/null
+++ b/lib/CPUs/JCpu/ghdl/tb_cpu_embedded_with_uart.gtkw
@@ -0,0 +1,33 @@
+[*]
+[*] GTKWave Analyzer v3.3.104 (w)1999-2020 BSI
+[*] Sun Apr  4 08:30:47 2021
+[*]
+[dumpfile] "/home/jens/work/vhdl/trunk/lib/CPUs/JCpu/ghdl/build/tb_cpu_embedded_with_uart/tb_cpu_embedded_with_uart.fst"
+[dumpfile_mtime] "Sun Apr  4 08:29:53 2021"
+[dumpfile_size] 5098
+[savefile] "/home/jens/work/vhdl/trunk/lib/CPUs/JCpu/ghdl/build/tb_cpu_embedded_with_uart/tb_cpu_embedded_with_uart.gtkw"
+[timestart] 0
+[size] 1856 1136
+[pos] 1983 26
+*-27.352621 339300000 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
+[sst_width] 383
+[signals_width] 256
+[sst_expanded] 1
+[sst_vpaned_height] 331
+@28
+uut.clk
+uut.ce
+uut.rst
+@22
+uut.irom_data[17:0]
+@28
+uut.cpu_xmem_re
+uut.cpu_xmem_we
+@22
+uut.cpu_xmem_dout[7:0]
+uut.cpu_xmem_din[7:0]
+uut.cpu_xmem_addr[7:0]
+@29
+uut.cpu_io_sel
+[pattern_trace] 1
+[pattern_trace] 0