diff --git a/fuzzers/058-hclkpips/.gitignore b/fuzzers/058-hclkpips/.gitignore
index 87451d1d..1514ca58 100644
--- a/fuzzers/058-hclkpips/.gitignore
+++ b/fuzzers/058-hclkpips/.gitignore
@@ -1 +1,2 @@
 /specimen_*/
+/seg_hclk_[lr].segbits
diff --git a/fuzzers/058-hclkpips/Makefile b/fuzzers/058-hclkpips/Makefile
index a0bd6f00..5357a99e 100644
--- a/fuzzers/058-hclkpips/Makefile
+++ b/fuzzers/058-hclkpips/Makefile
@@ -4,20 +4,20 @@ SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N)))
 SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
 
 database: $(SPECIMENS_OK)
-	# ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_clbl[lm]_l.txt,$(SPECIMENS))
-	# ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_clbl[lm]_r.txt,$(SPECIMENS))
+	${XRAY_SEGMATCH} -o seg_hclk_l.segbits $(addsuffix /segdata_hclk_l_design_*.txt,$(SPECIMENS))
+	${XRAY_SEGMATCH} -o seg_hclk_r.segbits $(addsuffix /segdata_hclk_r_design_*.txt,$(SPECIMENS))
 
 pushdb:
-	# ${XRAY_MERGEDB} int_l seg_int_l.segbits
-	# ${XRAY_MERGEDB} int_r seg_int_r.segbits
-	# ${XRAY_DBFIXUP}
+	${XRAY_MERGEDB} hclk_l seg_hclk_l.segbits
+	${XRAY_MERGEDB} hclk_r seg_hclk_r.segbits
+	${XRAY_DBFIXUP}
 
 $(SPECIMENS_OK):
 	bash generate.sh $(subst /OK,,$@)
 	touch $@
 
 clean:
-	rm -rf specimen_[0-9][0-9][0-9]/
+	rm -rf specimen_[0-9][0-9][0-9]/ seg_hclk_[lr].segbits
 
 .PHONY: database pushdb clean
 
diff --git a/fuzzers/058-hclkpips/generate.py b/fuzzers/058-hclkpips/generate.py
index 9a72f9a1..1f63ac59 100644
--- a/fuzzers/058-hclkpips/generate.py
+++ b/fuzzers/058-hclkpips/generate.py
@@ -15,7 +15,7 @@ for arg in sys.argv[1:]:
             _, pip = pip.split("/")
             tile_type, pip = pip.split(".")
             src, dst = pip.split("->>")
-            tag = "%s.%s.%s" % (tile_type, dst, src)
+            tag = "%s.%s" % (dst, src)
             tags[tag] = dst
 
 for arg in sys.argv[1:]:
@@ -32,7 +32,7 @@ for arg in sys.argv[1:]:
             _, pip = pip.split("/")
             tile_type, pip = pip.split(".")
             src, dst = pip.split("->>")
-            tag = "%s.%s.%s" % (tile_type, dst, src)
+            tag = "%s.%s" % (dst, src)
             segmk.addtag(tile, tag, 1)
             for tag, tag_dst in tags.items():
                 if tag_dst != dst:
diff --git a/utils/mergedb.sh b/utils/mergedb.sh
index c378c033..461473d9 100644
--- a/utils/mergedb.sh
+++ b/utils/mergedb.sh
@@ -32,6 +32,11 @@ case "$1" in
 	int_r)
 		sed < "$2" > "$tmp1" -e 's/^INT\./INT_R./' ;;
 
+	hclk_l)
+		sed < "$2" > "$tmp1" -e 's/^HCLK\./HCLK_L./' ;;
+	hclk_r)
+		sed < "$2" > "$tmp1" -e 's/^HCLK\./HCLK_R./' ;;
+
 	mask_*)
 		db=$XRAY_DATABASE_DIR/$XRAY_DATABASE/$1.db
 		cp "$2" "$tmp1" ;;