diff --git a/ECP5/tiledata/MIB2_DSP0/bits.db b/ECP5/tiledata/MIB2_DSP0/bits.db
index f78f5d5..75e36d9 100644
--- a/ECP5/tiledata/MIB2_DSP0/bits.db
+++ b/ECP5/tiledata/MIB2_DSP0/bits.db
@@ -259,6 +259,10 @@
 CLK3 -
 NONE F27B1 F28B1 F79B1 F83B1
 
+.config_enum MULT18_1.CIBOUT_BYP ON
+OFF F34B1 F35B1 F36B1 F37B1
+ON -
+
 .config_enum MULT18_1.REG_INPUTA_CE CE3
 CE0 F4B1 F5B1 F17B1 F18B1 F23B1 F24B1 F25B1 F29B1 F41B1 F42B1
 CE1 F5B1 F18B1 F24B1 F29B1 F42B1
diff --git a/ECP5/tiledata/MIB2_DSP1/bits.db b/ECP5/tiledata/MIB2_DSP1/bits.db
index e08a6e4..3935f7c 100644
--- a/ECP5/tiledata/MIB2_DSP1/bits.db
+++ b/ECP5/tiledata/MIB2_DSP1/bits.db
@@ -197,7 +197,7 @@
 CLK3 F98B1 F101B1
 NONE -
 
-.config_enum DSP_LEFT.CIBOUT OFF
+.config_enum MULT18_0.CIBOUT_BYP OFF
 OFF -
 ON F14B1 F16B1
 
diff --git a/ECP5/tiledata/MIB2_DSP2/bits.db b/ECP5/tiledata/MIB2_DSP2/bits.db
index 3d1ed75..65bd40d 100644
--- a/ECP5/tiledata/MIB2_DSP2/bits.db
+++ b/ECP5/tiledata/MIB2_DSP2/bits.db
@@ -154,6 +154,10 @@
 ASYNC F18B1 F28B1 F40B1 F50B1 F55B1 F65B1 F89B1 F96B1
 SYNC -
 
+.config_enum MULT18_0.CIBOUT_BYP ON
+OFF F8B1 F9B1 F11B1 F12B1
+ON -
+
 .config_enum MULT18_0.MODE NONE
 MULT18X18D F1B0 F14B0 F82B0 F83B0 F86B0
 NONE -
@@ -214,6 +218,10 @@
 ASYNC F4B1 F18B1 F28B1 F40B1 F50B1 F54B1 F64B1 F89B1 F96B1
 SYNC -
 
+.config_enum MULT18_1.CIBOUT_BYP ON
+OFF F48B1 F49B1 F58B1 F59B1
+ON -
+
 .config_enum MULT18_1.MODE NONE
 MULT18X18D F1B0 F14B0 F82B0 F83B0 F86B0
 NONE -
diff --git a/ECP5/tiledata/MIB2_DSP3/bits.db b/ECP5/tiledata/MIB2_DSP3/bits.db
index 17d669e..aefeda7 100644
--- a/ECP5/tiledata/MIB2_DSP3/bits.db
+++ b/ECP5/tiledata/MIB2_DSP3/bits.db
@@ -462,6 +462,10 @@
 MULT18X18D F30B0 F34B1
 NONE -
 
+.config_enum MULT18_1.CIBOUT_BYP
+OFF F3B1 F4B1 F5B1 F6B1
+ON F77B1 F78B1
+
 .config_enum MULT18_1.MODE NONE
 MULT18X18D F28B1 F30B0
 NONE -
diff --git a/ECP5/tiledata/MIB2_DSP4/bits.db b/ECP5/tiledata/MIB2_DSP4/bits.db
index 5346001..3bd11a0 100644
--- a/ECP5/tiledata/MIB2_DSP4/bits.db
+++ b/ECP5/tiledata/MIB2_DSP4/bits.db
@@ -194,9 +194,9 @@
 CLK3 F95B1 F96B1
 NONE -
 
-.config_enum DSP_RIGHT.CIBOUT OFF
-OFF -
-ON F69B1 F70B1
+.config_enum MULT18_0.CIBOUT_BYP ON
+OFF F10B1 F11B1 F38B1 F39B1
+ON -
 
 .config_enum MULT18_0.REG_INPUTA_CE CE3
 CE0 F2B1 F3B1 F17B1 F18B1 F42B1 F43B1
@@ -237,6 +237,10 @@
 CLK3 -
 NONE F0B1 F5B1
 
+.config_enum MULT18_4.CIBOUT_BYP OFF
+OFF -
+ON F69B1 F70B1
+
 .config_enum MULT18_4.REG_PIPELINE_CLK CLK3
 CLK0 -
 CLK1 -
@@ -244,6 +248,10 @@
 CLK3 -
 NONE F80B1 F83B1
 
+.config_enum MULT18_5.CIBOUT_BYP ON
+OFF F92B1 F94B1 F95B1 F96B1
+ON -
+
 .config_enum MULT18_5.REG_INPUTA_CE CE3
 CE0 F56B1 F57B1 F81B1 F82B1 F84B1 F85B1 F90B1 F91B1 F97B1
 CE1 F57B1 F82B1 F85B1 F91B1
diff --git a/ECP5/tiledata/MIB2_DSP6/bits.db b/ECP5/tiledata/MIB2_DSP6/bits.db
index fe2ac9c..fe09b95 100644
--- a/ECP5/tiledata/MIB2_DSP6/bits.db
+++ b/ECP5/tiledata/MIB2_DSP6/bits.db
@@ -368,6 +368,10 @@
 ASYNC F70B1 F82B1 F92B1 F104B1
 SYNC -
 
+.config_enum MULT18_4.CIBOUT_BYP ON
+OFF F62B1 F63B1 F64B1 F65B1
+ON -
+
 .config_enum MULT18_4.MODE NONE
 MULT18X18D F18B0 F33B1 F37B0 F48B0 F55B0 F67B0
 NONE -
@@ -435,6 +439,10 @@
 ASYNC F6B1 F18B1 F30B1 F43B1 F50B1 F58B1 F70B1 F82B1 F92B1 F104B1
 SYNC -
 
+.config_enum MULT18_5.CIBOUT_BYP ON
+OFF F102B1 F103B1
+ON -
+
 .config_enum MULT18_5.MODE NONE
 MULT18X18D F18B0 F23B1 F37B0 F48B0 F55B0 F67B0
 NONE -
diff --git a/ECP5/tiledata/MIB2_DSP7/bits.db b/ECP5/tiledata/MIB2_DSP7/bits.db
index 13bc037..1d44cb8 100644
--- a/ECP5/tiledata/MIB2_DSP7/bits.db
+++ b/ECP5/tiledata/MIB2_DSP7/bits.db
@@ -167,6 +167,10 @@
 ASYNC F0B1 F10B1 F34B1 F46B1
 SYNC -
 
+.config_enum MULT18_5.CIBOUT_BYP ON
+OFF F4B1 F5B1 F49B1 F57B1 F58B1 F59B1
+ON -
+
 .config_enum MULT18_5.MODE NONE
 MULT18X18D F29B0 F30B0 F32B0 F83B0
 NONE -
diff --git a/ECP5/tiledata/MIB2_DSP8/bits.db b/ECP5/tiledata/MIB2_DSP8/bits.db
index 1f5be81..f557b63 100644
--- a/ECP5/tiledata/MIB2_DSP8/bits.db
+++ b/ECP5/tiledata/MIB2_DSP8/bits.db
@@ -204,6 +204,10 @@
 OFF -
 ON F20B1 F21B1 F22B1 F25B1
 
+.config_enum MULT18_4.CIBOUT_BYP ON
+OFF F49B1 F66B1 F87B1 F88B1
+ON -
+
 .config_enum MULT18_4.REG_INPUTA_CE CE3
 CE0 F54B1 F55B1 F68B1 F69B1 F91B1 F92B1
 CE1 F54B1 F68B1 F92B1
@@ -236,6 +240,10 @@
 CE2 F61B1 F77B1 F81B1 F85B1
 CE3 -
 
+.config_enum MULT18_5.CIBOUT_BYP OFF
+OFF -
+ON F18B1 F19B1
+
 .config_enum MULT18_5.REG_PIPELINE_CLK CLK3
 CLK0 -
 CLK1 -