diff --git a/lib/JBUS/busmaster/ghdl/busmaster_async.inc b/lib/JBUS/busmaster/ghdl/busmaster_async.inc
new file mode 100644
index 0000000..3d5faf1
--- /dev/null
+++ b/lib/JBUS/busmaster/ghdl/busmaster_async.inc
@@ -0,0 +1,14 @@
+# -----------------------------------------------------------
+include $(VHDL_MAKE_HOME)/defs.mk
+include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc
+# -----------------------------------------------------------
+PKG_NAME := BUSMASTER_ASYNC
+
+# -----------------------------------------------------------
+$(PKG_NAME)_SRCS := $(FIFO_ASYNC_SRCS)
+$(PKG_NAME)_SRCS += $(LIB_PATH)/misc/utils_pkg.vhd
+$(PKG_NAME)_SRCS += $(LIB_PATH)/JBUS/busmaster/src/busmaster_types.vhd
+$(PKG_NAME)_SRCS += $(LIB_PATH)/JBUS/busmaster/src/busmaster_async.vhd
+
+# -----------------------------------------------------------
+
diff --git a/lib/JBUS/busmaster/ghdl/busmaster_sync.inc b/lib/JBUS/busmaster/ghdl/busmaster_sync.inc
new file mode 100644
index 0000000..2147abd
--- /dev/null
+++ b/lib/JBUS/busmaster/ghdl/busmaster_sync.inc
@@ -0,0 +1,14 @@
+# -----------------------------------------------------------
+include $(VHDL_MAKE_HOME)/defs.mk
+include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc
+# -----------------------------------------------------------
+PKG_NAME := BUSMASTER_SYNC
+
+# -----------------------------------------------------------
+$(PKG_NAME)_SRCS := $(FIFO_SYNC_SRCS)
+$(PKG_NAME)_SRCS += $(LIB_PATH)/misc/utils_pkg.vhd
+$(PKG_NAME)_SRCS += $(LIB_PATH)/JBUS/busmaster/src/busmaster_types.vhd
+$(PKG_NAME)_SRCS += $(LIB_PATH)/JBUS/busmaster/src/busmaster_sync.vhd
+
+# -----------------------------------------------------------
+
diff --git a/lib/JBUS/busmaster/ghdl/tb_busmaster_async.make b/lib/JBUS/busmaster/ghdl/tb_busmaster_async.make
index ea707ef..9d47436 100644
--- a/lib/JBUS/busmaster/ghdl/tb_busmaster_async.make
+++ b/lib/JBUS/busmaster/ghdl/tb_busmaster_async.make
@@ -1,13 +1,8 @@
 include $(VHDL_MAKE_HOME)/defs.mk
-include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc
+include $(LIB_PATH)/JBUS/busmaster/ghdl/busmaster_async.inc
 
-MOD_PATH := $(LIB_PATH)/JBUS/busmaster
-
-SRCS += $(LIB_PATH)/misc/utils_pkg.vhd
-SRCS += $(FIFO_ASYNC_SRCS)
-SRCS += $(MOD_PATH)/src/busmaster_types.vhd
-SRCS += $(MOD_PATH)/src/busmaster_async.vhd
-SRCS += $(MOD_PATH)/src/tb_busmaster_async.vhd
+SRCS += $(BUSMASTER_ASYNC_SRCS)
+SRCS += $(LIB_PATH)/JBUS/busmaster/src/tb_busmaster_async.vhd
 
 # Compile
 TARGET := tb_busmaster_async
diff --git a/lib/JBUS/busmaster/ghdl/tb_busmaster_sync.make b/lib/JBUS/busmaster/ghdl/tb_busmaster_sync.make
index cfe5c0a..762792f 100644
--- a/lib/JBUS/busmaster/ghdl/tb_busmaster_sync.make
+++ b/lib/JBUS/busmaster/ghdl/tb_busmaster_sync.make
@@ -1,13 +1,8 @@
 include $(VHDL_MAKE_HOME)/defs.mk
-include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc
+include $(LIB_PATH)/JBUS/busmaster/ghdl/busmaster_sync.inc
 
-MOD_PATH := $(LIB_PATH)/JBUS/busmaster
-
-SRCS += $(LIB_PATH)/misc/utils_pkg.vhd
-SRCS += $(FIFO_SYNC_SRCS)
-SRCS += $(MOD_PATH)/src/busmaster_types.vhd
-SRCS += $(MOD_PATH)/src/busmaster_sync.vhd
-SRCS += $(MOD_PATH)/src/tb_busmaster_sync.vhd
+SRCS += $(BUSMASTER_SYNC_SRCS)
+SRCS += $(LIB_PATH)/JBUS/busmaster/src/tb_busmaster_sync.vhd
 
 # Compile
 TARGET := tb_busmaster_sync