diff --git a/src/main/kotlin/mods/betterfoliage/client/Client.kt b/src/main/kotlin/mods/betterfoliage/client/Client.kt
index 3188fd1..4c454ea 100644
--- a/src/main/kotlin/mods/betterfoliage/client/Client.kt
+++ b/src/main/kotlin/mods/betterfoliage/client/Client.kt
@@ -2,6 +2,7 @@ package mods.betterfoliage.client
 
 import mods.betterfoliage.BetterFoliageMod
 import mods.betterfoliage.client.gui.ConfigGuiFactory
+import mods.betterfoliage.client.integration.ForestryIntegration
 import mods.betterfoliage.client.integration.OptifineCTM
 import mods.betterfoliage.client.integration.ShadersModIntegration
 import mods.betterfoliage.client.render.*
@@ -65,7 +66,8 @@ object Client {
         LeafWindTracker,
         RisingSoulTextures,
         ShadersModIntegration,
-        OptifineCTM
+        OptifineCTM,
+        ForestryIntegration
     )
 
     fun log(level: Level, msg: String) {
diff --git a/src/main/kotlin/mods/betterfoliage/client/integration/ForestryIntegration.kt b/src/main/kotlin/mods/betterfoliage/client/integration/ForestryIntegration.kt
new file mode 100644
index 0000000..1459061
--- /dev/null
+++ b/src/main/kotlin/mods/betterfoliage/client/integration/ForestryIntegration.kt
@@ -0,0 +1,89 @@
+package mods.betterfoliage.client.integration
+
+import mods.betterfoliage.client.Client
+import mods.betterfoliage.client.texture.ILeafRegistry
+import mods.betterfoliage.client.texture.LeafInfo
+import mods.betterfoliage.client.texture.LeafRegistry
+import mods.betterfoliage.client.texture.StandardLeafSupport
+import mods.betterfoliage.loader.Refs
+import mods.octarinecore.client.resource.get
+import mods.octarinecore.metaprog.ClassRef
+import mods.octarinecore.metaprog.FieldRef
+import mods.octarinecore.metaprog.MethodRef
+import mods.octarinecore.metaprog.allAvailable
+import net.minecraft.block.state.IBlockState
+import net.minecraft.client.Minecraft
+import net.minecraft.client.renderer.texture.TextureAtlasSprite
+import net.minecraft.client.renderer.texture.TextureMap
+import net.minecraft.util.EnumFacing
+import net.minecraft.util.ResourceLocation
+import net.minecraft.util.math.BlockPos
+import net.minecraft.world.IBlockAccess
+import net.minecraftforge.client.event.TextureStitchEvent
+import net.minecraftforge.common.MinecraftForge
+import net.minecraftforge.fml.common.Loader
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import net.minecraftforge.fml.relauncher.Side
+import net.minecraftforge.fml.relauncher.SideOnly
+import org.apache.logging.log4j.Level
+
+@SideOnly(Side.CLIENT)
+object ForestryIntegration {
+
+    val TextureLeaves = ClassRef("forestry.arboriculture.models.TextureLeaves")
+    val TeLleafTextures = FieldRef(TextureLeaves, "leafTextures", Refs.Map)
+    val TeLplain = FieldRef(TextureLeaves, "plain", Refs.ResourceLocation)
+    val TeLfancy = FieldRef(TextureLeaves, "fancy", Refs.ResourceLocation)
+    val TeLpollplain = FieldRef(TextureLeaves, "pollinatedPlain", Refs.ResourceLocation)
+    val TeLpollfancy = FieldRef(TextureLeaves, "pollinatedFancy", Refs.ResourceLocation)
+    val TileLeaves = ClassRef("forestry.arboriculture.tiles.TileLeaves")
+    val TiLgetLeaveSprite = MethodRef(TileLeaves, "getLeaveSprite", Refs.ResourceLocation, ClassRef.boolean)
+
+    init {
+        if (Loader.isModLoaded("forestry") && allAvailable(TextureLeaves, TileLeaves)) {
+            Client.log(Level.INFO, "Forestry support initialized")
+            LeafRegistry.subRegistries.add(ForestryLeavesSupport)
+        }
+    }
+}
+
+object ForestryLeavesSupport : ILeafRegistry {
+
+    val textureToValue = mutableMapOf<ResourceLocation, LeafInfo>()
+
+    init { MinecraftForge.EVENT_BUS.register(this) }
+
+    @SubscribeEvent
+    fun handlePreStitch(event: TextureStitchEvent.Pre) {
+        textureToValue.clear()
+        val allLeaves = ForestryIntegration.TeLleafTextures.getStatic() as Map<*, *>
+        allLeaves.entries.forEach {
+            listOf(
+                ForestryIntegration.TeLplain.get(it.value) as ResourceLocation,
+                ForestryIntegration.TeLfancy.get(it.value) as ResourceLocation,
+                ForestryIntegration.TeLpollplain.get(it.value) as ResourceLocation,
+                ForestryIntegration.TeLpollfancy.get(it.value) as ResourceLocation
+            ).forEach { leafLocation ->
+                registerLeaf(leafLocation, event.map)
+            }
+        }
+    }
+
+    fun registerLeaf(textureLocation: ResourceLocation, atlas: TextureMap) {
+        val texture = atlas[textureLocation.toString()] ?: return
+        var leafType = LeafRegistry.typeMappings.getType(texture) ?: "default"
+        val generated = atlas.registerSprite(
+            Client.genLeaves.generatedResource(texture.iconName, "type" to leafType)
+        )
+        textureToValue[textureLocation] = LeafInfo(generated, LeafRegistry.getParticleType(texture, atlas))
+    }
+
+    override fun get(state: IBlockState) = null
+
+    override fun get(state: IBlockState, world: IBlockAccess, pos: BlockPos, face: EnumFacing): LeafInfo? {
+        val tile = world.getTileEntity(pos) ?: return null
+        if (!ForestryIntegration.TileLeaves.isInstance(tile)) return null
+        val textureLoc = ForestryIntegration.TiLgetLeaveSprite.invoke(tile, Minecraft.isFancyGraphicsEnabled()) ?: return null
+        return textureToValue[textureLoc]
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/mods/betterfoliage/loader/Refs.kt b/src/main/kotlin/mods/betterfoliage/loader/Refs.kt
index fe4914b..f49227b 100644
--- a/src/main/kotlin/mods/betterfoliage/loader/Refs.kt
+++ b/src/main/kotlin/mods/betterfoliage/loader/Refs.kt
@@ -57,6 +57,7 @@ object Refs {
 
     val IModel = ClassRef("net.minecraftforge.client.model.IModel")
     val ModelBlock = ClassRef("net.minecraft.client.renderer.block.model.ModelBlock", "bpd")
+    val ResourceLocation = ClassRef("net.minecraft.util.ResourceLocation", "kn")
     val ModelResourceLocation = ClassRef("net.minecraft.client.renderer.block.model.ModelResourceLocation", "byq")
     val VanillaModelWrapper = ClassRef("net.minecraftforge.client.model.ModelLoader\$VanillaModelWrapper")
     val model_VMW = FieldRef(VanillaModelWrapper, "model", ModelBlock)