diff --git a/src/main/scala/li/cil/oc/integration/minecraft/ConverterFluidTankProperties.scala b/src/main/scala/li/cil/oc/integration/minecraft/ConverterFluidTankProperties.scala
new file mode 100644
index 000000000..80c99189d
--- /dev/null
+++ b/src/main/scala/li/cil/oc/integration/minecraft/ConverterFluidTankProperties.scala
@@ -0,0 +1,22 @@
+package li.cil.oc.integration.minecraft
+
+import java.util
+
+import li.cil.oc.api
+import net.minecraftforge.fluids
+
+import scala.collection.convert.WrapAsScala._
+
+object ConverterFluidTankProperties extends api.driver.Converter {
+  override def convert(value: AnyRef, output: util.Map[AnyRef, AnyRef]) =
+    value match {
+      case properties: fluids.capability.IFluidTankProperties =>
+        output += "capacity" -> Int.box(properties.getCapacity)
+        val fluid = properties.getContents
+        if (fluid != null) {
+          ConverterFluidStack.convert(fluid, output)
+        }
+        else output += "amount" -> Int.box(0)
+      case _ =>
+    }
+}
diff --git a/src/main/scala/li/cil/oc/integration/minecraft/ModMinecraft.scala b/src/main/scala/li/cil/oc/integration/minecraft/ModMinecraft.scala
index 54d4295ab..0c7672e33 100644
--- a/src/main/scala/li/cil/oc/integration/minecraft/ModMinecraft.scala
+++ b/src/main/scala/li/cil/oc/integration/minecraft/ModMinecraft.scala
@@ -46,6 +46,7 @@ object ModMinecraft extends ModProxy with RedstoneProvider {
 
     Driver.add(ConverterFluidStack)
     Driver.add(ConverterFluidTankInfo)
+    Driver.add(ConverterFluidTankProperties)
     Driver.add(ConverterItemStack)
     Driver.add(ConverterNBT)
     Driver.add(ConverterWorld)