diff --git a/buildcraft_resources/assets/buildcraft/lang/en_US.lang b/buildcraft_resources/assets/buildcraft/lang/en_US.lang
index 2aa22ec2..df8ce310 100644
--- a/buildcraft_resources/assets/buildcraft/lang/en_US.lang
+++ b/buildcraft_resources/assets/buildcraft/lang/en_US.lang
@@ -442,12 +442,13 @@ tip.gate.wires.diamond=Red, Blue, Green, Yellow
 tip.gate.wires.emerald=Red, Blue, Green, Yellow
 tip.gate.expansions=§9§oInstalled Expansions:
 
-tip.PipeFluidsCobblestone=Won't connect to Stone
+tip.PipeFluidsCobblestone=Won't connect to Stone or Quartz
 tip.PipeFluidsDiamond=Sorts fluids
 tip.PipeFluidsEmerald=Extraction pipe
 tip.PipeFluidsIron=Valve pipe
+tip.PipeFluidsQuartz=Won't connect to Cobblestone or Stone
 tip.PipeFluidsSandstone=Only connects to other pipes
-tip.PipeFluidsStone=Won't connect to Cobblestone
+tip.PipeFluidsStone=Won't connect to Cobblestone or Quartz
 tip.PipeFluidsVoid=Destroys fluids
 tip.PipeFluidsWood=Extraction pipe
 tip.PipeItemsClay=Insertion pipe
diff --git a/buildcraft_resources/changelog/7.1.0 b/buildcraft_resources/changelog/7.1.0
index f8210c4a..c969df50 100644
--- a/buildcraft_resources/changelog/7.1.0
+++ b/buildcraft_resources/changelog/7.1.0
@@ -1,3 +1,7 @@
+BREAKING CHANGES!
+
+* Quartz Fluid Pipes no longer connect to Cobblestone or Stone Fluid Pipes. This might break existing builds! (asie)
+
 Additions:
 
 * Clay fluid pipe! The power of insertion applied to liquids. (asie)
diff --git a/common/buildcraft/transport/PipeConnectionBans.java b/common/buildcraft/transport/PipeConnectionBans.java
index 8bb51605..aa3246da 100644
--- a/common/buildcraft/transport/PipeConnectionBans.java
+++ b/common/buildcraft/transport/PipeConnectionBans.java
@@ -13,6 +13,7 @@ import com.google.common.collect.SetMultimap;
 
 import buildcraft.transport.pipes.PipeFluidsCobblestone;
 import buildcraft.transport.pipes.PipeFluidsEmerald;
+import buildcraft.transport.pipes.PipeFluidsQuartz;
 import buildcraft.transport.pipes.PipeFluidsStone;
 import buildcraft.transport.pipes.PipeFluidsWood;
 import buildcraft.transport.pipes.PipeItemsCobblestone;
@@ -34,11 +35,10 @@ public final class PipeConnectionBans {
 
 	static {
 		// Fluid pipes
-		banConnection(PipeFluidsStone.class, PipeFluidsCobblestone.class);
+		banConnection(PipeFluidsStone.class, PipeFluidsCobblestone.class, PipeFluidsQuartz.class);
 		banConnection(PipeFluidsWood.class);
 		banConnection(PipeFluidsEmerald.class);
 		banConnection(PipeFluidsWood.class, PipeFluidsEmerald.class);
-		banConnection(PipeFluidsEmerald.class);
 
 		// Item Pipes
 		banConnection(PipeItemsStone.class, PipeItemsCobblestone.class, PipeItemsQuartz.class);
@@ -51,6 +51,7 @@ public final class PipeConnectionBans {
 		// Power Pipes
 		banConnection(PipePowerWood.class);
 		banConnection(PipePowerEmerald.class);
+		banConnection(PipePowerWood.class, PipePowerEmerald.class);
 	}
 
 	private PipeConnectionBans() {