diff --git a/src/api/java/appeng/api/definitions/IParts.java b/src/api/java/appeng/api/definitions/IParts.java
index ad816057b..7c1f842b5 100644
--- a/src/api/java/appeng/api/definitions/IParts.java
+++ b/src/api/java/appeng/api/definitions/IParts.java
@@ -82,6 +82,8 @@ public interface IParts
 
 	IItemDefinition p2PTunnelRF();
 
+	IItemDefinition p2PTunnelFE();
+
 	IItemDefinition p2PTunnelLight();
 
 	// IItemDefinition p2PTunnelOpenComputers();
diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java
index 0d7779a99..35a6a4444 100644
--- a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java
+++ b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java
@@ -161,8 +161,13 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry
 		 */
 
 		this.addNewAttunement( "thermaldynamics", TunnelType.RF_POWER );
+		this.addNewAttunement( "thermalexpansion", TunnelType.RF_POWER );
+		this.addNewAttunement( "thermalfoundation", TunnelType.RF_POWER );
+		// TODO: Remove when confirmed that the official 1.12 version of EnderIO will support FE.
 		this.addNewAttunement( "enderio", TunnelType.RF_POWER );
+		// TODO: Remove when confirmed that the official 1.12 version of Mekanism will support FE.
 		this.addNewAttunement( "mekanism", TunnelType.RF_POWER );
+		// TODO: Remove when support for RFTools' Powercells support is added
 		this.addNewAttunement( "rftools", TunnelType.RF_POWER );
 		this.addNewAttunement( "ic2", TunnelType.IC2_POWER );
 
diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java
index 72ada9cc9..3c99ab6d8 100644
--- a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java
+++ b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java
@@ -226,6 +226,10 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 					newType = parts.p2PTunnelRF().maybeStack( 1 ).orElse( ItemStack.EMPTY );
 					break;
 
+				case FE_POWER:
+					newType = parts.p2PTunnelFE().maybeStack( 1 ).orElse( ItemStack.EMPTY );
+					break;
+
 				case FLUID:
 					newType = parts.p2PTunnelFluids().maybeStack( 1 ).orElse( ItemStack.EMPTY );
 					break;