diff --git a/fuzzers/025-bram-config/Makefile b/fuzzers/025-bram-config/Makefile
index cee4723c..17bc7384 100644
--- a/fuzzers/025-bram-config/Makefile
+++ b/fuzzers/025-bram-config/Makefile
@@ -1,3 +1,22 @@
+# read/write width is relatively slow to resolve
+# Even slower with multi bit masks...
 N ?= 8
-DO_DBFIXUP?=Y
-include ../bram.mk
+
+include ../fuzzer.mk
+
+database: build/segbits_bramx.db
+
+build/segbits_bramx.rdb: $(SPECIMENS_OK)
+	${XRAY_SEGMATCH} -o build/segbits_bramx.rdb $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS))
+
+build/segbits_bramx.db: build/segbits_bramx.rdb
+	${XRAY_DBFIXUP} --db-root build --zero-db bits.dbf --seg-fn-in $^ --seg-fn-out $@
+	${XRAY_MASKMERGE} build/mask_bramx.db $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS))
+
+pushdb:
+	${XRAY_MERGEDB} bram_l build/segbits_bramx.db
+	${XRAY_MERGEDB} bram_r build/segbits_bramx.db
+	${XRAY_MERGEDB} mask_bram_l build/mask_bramx.db
+	${XRAY_MERGEDB} mask_bram_r build/mask_bramx.db
+
+.PHONY: database pushdb
diff --git a/fuzzers/026-bram-data/Makefile b/fuzzers/026-bram-data/Makefile
index 0fb57ca7..098f390d 100644
--- a/fuzzers/026-bram-data/Makefile
+++ b/fuzzers/026-bram-data/Makefile
@@ -1,2 +1,20 @@
 N ?= 8
-include ../bram.mk
+
+include ../fuzzer.mk
+
+database: build/segbits_bramx.block_ram.db
+
+build/segbits_bramx.block_ram.rdb: $(SPECIMENS_OK)
+	${XRAY_SEGMATCH} -o build/segbits_bramx.block_ram.rdb $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS))
+
+build/segbits_bramx.block_ram.db: build/segbits_bramx.block_ram.rdb
+	cp $^ $@
+	${XRAY_MASKMERGE} build/mask_bramx.block_ram.db $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS))
+
+pushdb:
+	${XRAY_MERGEDB} bram_l.block_ram build/segbits_bramx.block_ram.db
+	${XRAY_MERGEDB} bram_r.block_ram build/segbits_bramx.block_ram.db
+	${XRAY_MERGEDB} mask_bram_l.block_ram build/mask_bramx.block_ram.db
+	${XRAY_MERGEDB} mask_bram_r.block_ram build/mask_bramx.block_ram.db
+
+.PHONY: database pushdb
diff --git a/fuzzers/bram.mk b/fuzzers/bram.mk
deleted file mode 100644
index 7d916fe4..00000000
--- a/fuzzers/bram.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# read/write width is relatively slow to resolve
-# Even slower with multi bit masks...
-N ?= 8
-DO_DBFIXUP?=N
-
-include ../fuzzer.mk
-
-database: build/segbits_bramx.db
-
-build/segbits_bramx.rdb: $(SPECIMENS_OK)
-	${XRAY_SEGMATCH} -o build/segbits_bramx.rdb $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS))
-
-build/segbits_bramx.db: build/segbits_bramx.rdb
-ifeq ($(DO_DBFIXUP),Y)
-	${XRAY_DBFIXUP} --db-root build --zero-db bits.dbf --seg-fn-in $^ --seg-fn-out $@
-else
-	cp $^ $@
-endif
-	${XRAY_MASKMERGE} build/mask_bramx.db $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS))
-
-pushdb:
-	${XRAY_MERGEDB} bram_l build/segbits_bramx.db
-	${XRAY_MERGEDB} bram_r build/segbits_bramx.db
-	${XRAY_MERGEDB} mask_bram_l build/mask_bramx.db
-	${XRAY_MERGEDB} mask_bram_r build/mask_bramx.db
-
-.PHONY: database pushdb
-