diff --git a/uncore/src/main/scala/tilelink2/Buffer.scala b/uncore/src/main/scala/tilelink2/Buffer.scala
new file mode 100644
index 00000000..dd749d9e
--- /dev/null
+++ b/uncore/src/main/scala/tilelink2/Buffer.scala
@@ -0,0 +1,30 @@
+// See LICENSE for license details.
+
+package uncore.tilelink2
+
+import Chisel._
+
+class TLBuffer(entries: Int = 2, pipe: Boolean = false) extends LazyModule
+{
+  val node = TLIdentityNode()
+
+  lazy val module = Module(new LazyModuleImp(this) {
+    val io = new Bundle {
+      val in  = node.bundleIn
+      val out = node.bundleOut
+    }
+
+    val in  = io.in(0)
+    val out = io.out(0)
+
+    out.a <> Queue(in .a, entries, pipe)
+    in .d <> Queue(out.d, entries, pipe)
+    
+    val edge = node.edgesOut(0) // same as edgeIn(0)
+    if (edge.manager.anySupportAcquire && edge.client.anySupportProbe) {
+      in .b <> Queue(out.b, entries, pipe)
+      out.c <> Queue(in .c, entries, pipe)
+      out.e <> Queue(out.e, entries, pipe)
+    }
+  })
+}