diff --git a/projects/fmcomms2/common/fmcomms2_bd.tcl b/projects/fmcomms2/common/fmcomms2_bd.tcl
index 902aa6f52..c9814c302 100644
--- a/projects/fmcomms2/common/fmcomms2_bd.tcl
+++ b/projects/fmcomms2/common/fmcomms2_bd.tcl
@@ -47,6 +47,11 @@ if {$sys_zynq == 1} {
   set ad9361_adc_dma_irq  [create_bd_port -dir O ad9361_adc_dma_irq]
   set ad9361_dac_dma_irq  [create_bd_port -dir O ad9361_dac_dma_irq]
 
+if {$sys_zynq == 0} {
+  set fmcomms2_gpio_irq [create_bd_port -dir O fmcomms2_gpio_irq]
+  set fmcomms2_spi_irq  [create_bd_port -dir O fmcomms2_spi_irq]
+}
+
   # ad9361 core
 
   set axi_ad9361 [create_bd_cell -type ip -vlnv analog.com:user:axi_ad9361:1.0 axi_ad9361]
@@ -122,7 +127,6 @@ if {$sys_zynq == 0} {
 
 if {$sys_zynq == 0} {
   set_property -dict [list CONFIG.NUM_SI {10}] $axi_mem_interconnect
-  set_property -dict [list CONFIG.NUM_PORTS {9}] $sys_concat_intc
 }
 
 if {$sys_zynq == 1} {
@@ -157,7 +161,7 @@ if {$sys_zynq == 0} {
   connect_bd_net -net spi_mosi_i  [get_bd_ports spi_mosi_i]   [get_bd_pins axi_fmcomms2_spi/io0_i]
   connect_bd_net -net spi_mosi_o  [get_bd_ports spi_mosi_o]   [get_bd_pins axi_fmcomms2_spi/io0_o]
   connect_bd_net -net spi_miso_i  [get_bd_ports spi_miso_i]   [get_bd_pins axi_fmcomms2_spi/io1_i]
-  connect_bd_net -net axi_fmcomms2_spi_irq [get_bd_pins axi_fmcomms2_spi/ip2intc_irpt] [get_bd_pins sys_concat_intc/In7]
+  connect_bd_net -net axi_fmcomms2_spi_irq [get_bd_pins axi_fmcomms2_spi/ip2intc_irpt] [get_bd_ports fmcomms2_spi_irq]
 } else {
   connect_bd_net -net spi_csn_i   [get_bd_ports spi_csn_i]    [get_bd_pins sys_ps7/SPI0_SS_I]
   connect_bd_net -net spi_csn_o   [get_bd_ports spi_csn_o]    [get_bd_pins sys_ps7/SPI0_SS_O]
@@ -174,7 +178,7 @@ if {$sys_zynq == 0} {
   connect_bd_net -net gpio_fmcomms2_i [get_bd_ports gpio_fmcomms2_i]    [get_bd_pins axi_fmcomms2_gpio/gpio_io_i]
   connect_bd_net -net gpio_fmcomms2_o [get_bd_ports gpio_fmcomms2_o]    [get_bd_pins axi_fmcomms2_gpio/gpio_io_o]
   connect_bd_net -net gpio_fmcomms2_t [get_bd_ports gpio_fmcomms2_t]    [get_bd_pins axi_fmcomms2_gpio/gpio_io_t]
-  connect_bd_net -net axi_fmcomms2_gpio_irq [get_bd_pins axi_fmcomms2_gpio/ip2intc_irpt] [get_bd_pins sys_concat_intc/In8]
+  connect_bd_net -net axi_fmcomms2_gpio_irq [get_bd_pins axi_fmcomms2_gpio/ip2intc_irpt] [get_bd_ports fmcomms2_gpio_irq]
 }
 
   # connections (up/down converter spi)