diff --git a/fuzzers/016-clbnoutmux/.gitignore b/fuzzers/016-clbnoutmux/.gitignore
index 93b5bef8..826eddb4 100644
--- a/fuzzers/016-clbnoutmux/.gitignore
+++ b/fuzzers/016-clbnoutmux/.gitignore
@@ -1,4 +1,5 @@
 /specimen_*/
 /*.segbits
+!/o6.segbits
 /vivado.log
 /vivado.jou
diff --git a/fuzzers/016-clbnoutmux/Makefile b/fuzzers/016-clbnoutmux/Makefile
index 14918675..34b0143b 100644
--- a/fuzzers/016-clbnoutmux/Makefile
+++ b/fuzzers/016-clbnoutmux/Makefile
@@ -4,6 +4,8 @@ SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
 
 database: $(SPECIMENS_OK)
 	${XRAY_SEGMATCH} -o seg_clblx.segbits $(addsuffix /segdata_clbl[lm]_[lr].txt,$(SPECIMENS))
+	cat seg_clblx.segbits |grep -v O6 >tmp.segbits
+	cat tmp.segbits o6.segbits >seg_clblx.segbits
 
 pushdb:
 	${XRAY_MERGEDB} clbll_l seg_clblx.segbits
@@ -17,7 +19,7 @@ $(SPECIMENS_OK):
 	touch $@
 
 clean:
-	rm -rf specimen_[0-9][0-9][0-9]/ seg_clblx.segbits vivado*.log vivado_*.str vivado*.jou design *.bits *.dcp *.bit top.v
+	rm -rf specimen_[0-9][0-9][0-9]/ *.segbits vivado*.log vivado_*.str vivado*.jou design *.bits *.dcp *.bit top.v
 
 .PHONY: database pushdb clean
 
diff --git a/fuzzers/016-clbnoutmux/README.txt b/fuzzers/016-clbnoutmux/README.txt
index 66451f7e..6bcb8088 100644
--- a/fuzzers/016-clbnoutmux/README.txt
+++ b/fuzzers/016-clbnoutmux/README.txt
@@ -1,5 +1,6 @@
 Purpose:
 Document AOUTMUX family of CLB muxes
+TODO: document O6
 
 Algorithm:
 
@@ -38,3 +39,14 @@ CLB.SLICE_X1.DMUX.B1 30_53
 CLB.SLICE_X1.DMUX.B2 31_57
 CLB.SLICE_X1.DMUX.B3 31_53
 
+
+From manual O6 testing
+30_11   X0 AOUTMUX O6
+30_20   X0 BOUTMUX O6
+30_45   X0 COUTMUX O6
+30_56   X0 DOUTMUX O6
+31_09   X1 AOUTMUX O6
+31_20   X1 BOUTMUX O6
+31_43   X1 COUTMUX O6
+31_56   X1 DOUTMUX O6
+
diff --git a/fuzzers/016-clbnoutmux/o6.segbits b/fuzzers/016-clbnoutmux/o6.segbits
new file mode 100644
index 00000000..1ebfe71b
--- /dev/null
+++ b/fuzzers/016-clbnoutmux/o6.segbits
@@ -0,0 +1,8 @@
+CLB.SLICE_X0.AMUX.O6 30_11
+CLB.SLICE_X0.BMUX.O6 30_20
+CLB.SLICE_X0.CMUX.O6 30_45
+CLB.SLICE_X0.DMUX.O6 30_56
+CLB.SLICE_X1.AMUX.O6 31_09
+CLB.SLICE_X1.BMUX.O6 31_20
+CLB.SLICE_X1.CMUX.O6 31_43
+CLB.SLICE_X1.DMUX.O6 31_56