diff --git a/projects/fmcomms11/common/fmcomms11_bd.tcl b/projects/fmcomms11/common/fmcomms11_bd.tcl
index 9ed4be03b..b4ed4a6ed 100644
--- a/projects/fmcomms11/common/fmcomms11_bd.tcl
+++ b/projects/fmcomms11/common/fmcomms11_bd.tcl
@@ -1,4 +1,6 @@
 
+source $ad_hdl_dir/library/jesd204/scripts/jesd204.tcl
+
 # dac peripherals
 
 ad_ip_instance axi_adxcvr axi_ad9162_xcvr
@@ -8,9 +10,7 @@ ad_ip_parameter axi_ad9162_xcvr CONFIG.TX_OR_RX_N 1
 
 ad_ip_instance axi_ad9162 axi_ad9162_core
 
-ad_ip_instance jesd204 axi_ad9162_jesd
-ad_ip_parameter axi_ad9162_jesd CONFIG.C_NODE_IS_TRANSMIT 1
-ad_ip_parameter axi_ad9162_jesd CONFIG.C_LANES 8
+adi_axi_jesd204_tx_create axi_ad9162_jesd 8
 
 ad_ip_instance axi_dmac axi_ad9162_dma
 ad_ip_parameter axi_ad9162_dma CONFIG.DMA_TYPE_SRC 0
@@ -33,9 +33,7 @@ ad_ip_parameter axi_ad9625_xcvr CONFIG.TX_OR_RX_N 0
 
 ad_ip_instance axi_ad9625 axi_ad9625_core
 
-ad_ip_instance jesd204 axi_ad9625_jesd
-ad_ip_parameter axi_ad9625_jesd CONFIG.C_NODE_IS_TRANSMIT 0
-ad_ip_parameter axi_ad9625_jesd CONFIG.C_LANES 8
+adi_axi_jesd204_rx_create axi_ad9625_jesd 8
 
 ad_ip_instance axi_dmac axi_ad9625_dma
 ad_ip_parameter axi_ad9625_dma CONFIG.DMA_TYPE_SRC 1
@@ -78,7 +76,7 @@ ad_connect  sys_cpu_clk util_fmcomms11_xcvr/up_clk
 
 ad_xcvrcon  util_fmcomms11_xcvr axi_ad9162_xcvr axi_ad9162_jesd
 ad_connect  util_fmcomms11_xcvr/tx_out_clk_0 axi_ad9162_core/tx_clk
-ad_connect  axi_ad9162_jesd/tx_tdata axi_ad9162_core/tx_data
+ad_connect  axi_ad9162_jesd/tx_data_tdata axi_ad9162_core/tx_data
 ad_connect  util_fmcomms11_xcvr/tx_out_clk_0 axi_ad9162_fifo/dac_clk
 ad_connect  axi_ad9162_core/dac_valid axi_ad9162_fifo/dac_valid
 ad_connect  axi_ad9162_core/dac_ddata axi_ad9162_fifo/dac_data
@@ -97,8 +95,8 @@ ad_connect  axi_ad9162_fifo/dma_xfer_last axi_ad9162_dma/m_axis_last
 
 ad_xcvrcon  util_fmcomms11_xcvr axi_ad9625_xcvr axi_ad9625_jesd
 ad_connect  util_fmcomms11_xcvr/rx_out_clk_0 axi_ad9625_core/rx_clk
-ad_connect  axi_ad9625_jesd/rx_start_of_frame axi_ad9625_core/rx_sof
-ad_connect  axi_ad9625_jesd/rx_tdata axi_ad9625_core/rx_data
+ad_connect  axi_ad9625_jesd/rx_sof axi_ad9625_core/rx_sof
+ad_connect  axi_ad9625_jesd/rx_data_tdata axi_ad9625_core/rx_data
 ad_connect  util_fmcomms11_xcvr/rx_out_clk_0 axi_ad9625_fifo/adc_clk
 ad_connect  axi_ad9625_jesd_rstgen/peripheral_reset axi_ad9625_fifo/adc_rst
 ad_connect  axi_ad9625_core/adc_valid axi_ad9625_fifo/adc_wr
@@ -120,7 +118,7 @@ ad_cpu_interconnect 0x44A90000 axi_ad9162_jesd
 ad_cpu_interconnect 0x7c420000 axi_ad9162_dma
 ad_cpu_interconnect 0x44A50000 axi_ad9625_xcvr
 ad_cpu_interconnect 0x44A10000 axi_ad9625_core
-ad_cpu_interconnect 0x44A91000 axi_ad9625_jesd
+ad_cpu_interconnect 0x44AA0000 axi_ad9625_jesd
 ad_cpu_interconnect 0x7c400000 axi_ad9625_dma
 
 # gt uses hp3, and 100MHz clock for both DRP and AXI4
diff --git a/projects/fmcomms11/zc706/Makefile b/projects/fmcomms11/zc706/Makefile
index 500877d25..24939205d 100644
--- a/projects/fmcomms11/zc706/Makefile
+++ b/projects/fmcomms11/zc706/Makefile
@@ -20,6 +20,7 @@ M_DEPS += ../../common/zc706/zc706_plddr3_constr.xdc
 M_DEPS += ../../common/zc706/zc706_plddr3_adcfifo_bd.tcl
 M_DEPS += ../../common/xilinx/dacfifo_bd.tcl
 M_DEPS += ../../../library/xilinx/common/ad_iobuf.v
+M_DEPS += ../../../library/jesd204/scripts/jesd204.tcl
 M_DEPS += ../../../library/axi_ad9162/axi_ad9162.xpr
 M_DEPS += ../../../library/axi_ad9625/axi_ad9625.xpr
 M_DEPS += ../../../library/xilinx/axi_adcfifo/axi_adcfifo.xpr
@@ -27,7 +28,11 @@ M_DEPS += ../../../library/xilinx/axi_adxcvr/axi_adxcvr.xpr
 M_DEPS += ../../../library/axi_clkgen/axi_clkgen.xpr
 M_DEPS += ../../../library/axi_dmac/axi_dmac.xpr
 M_DEPS += ../../../library/axi_hdmi_tx/axi_hdmi_tx.xpr
+M_DEPS += ../../../library/jesd204/axi_jesd204_rx/axi_jesd204_rx.xpr
+M_DEPS += ../../../library/jesd204/axi_jesd204_tx/axi_jesd204_tx.xpr
 M_DEPS += ../../../library/axi_spdif_tx/axi_spdif_tx.xpr
+M_DEPS += ../../../library/jesd204/jesd204_rx/jesd204_rx.xpr
+M_DEPS += ../../../library/jesd204/jesd204_tx/jesd204_tx.xpr
 M_DEPS += ../../../library/xilinx/util_adxcvr/util_adxcvr.xpr
 M_DEPS += ../../../library/util_dacfifo/util_dacfifo.xpr
 
@@ -65,7 +70,11 @@ clean-all:clean
 	make -C ../../../library/axi_clkgen clean
 	make -C ../../../library/axi_dmac clean
 	make -C ../../../library/axi_hdmi_tx clean
+	make -C ../../../library/jesd204/axi_jesd204_rx clean
+	make -C ../../../library/jesd204/axi_jesd204_tx clean
 	make -C ../../../library/axi_spdif_tx clean
+	make -C ../../../library/jesd204/jesd204_rx clean
+	make -C ../../../library/jesd204/jesd204_tx clean
 	make -C ../../../library/xilinx/util_adxcvr clean
 	make -C ../../../library/util_dacfifo clean
 
@@ -83,7 +92,11 @@ lib:
 	make -C ../../../library/axi_clkgen
 	make -C ../../../library/axi_dmac
 	make -C ../../../library/axi_hdmi_tx
+	make -C ../../../library/jesd204/axi_jesd204_rx
+	make -C ../../../library/jesd204/axi_jesd204_tx
 	make -C ../../../library/axi_spdif_tx
+	make -C ../../../library/jesd204/jesd204_rx
+	make -C ../../../library/jesd204/jesd204_tx
 	make -C ../../../library/xilinx/util_adxcvr
 	make -C ../../../library/util_dacfifo