diff --git a/changelog.md b/changelog.md
index 8acd2120aef2..e1f40bb385f5 100644
--- a/changelog.md
+++ b/changelog.md
@@ -9,6 +9,32 @@
 
 ## Language changes
 
+- With the experimental option `--experimental:typedTypeMacroPragma`,
+  macro pragmas in type definitions now receive a unary `nnkTypeSection` as
+  the argument instead of `nnkTypeDef`, which means `typed` arguments are now
+  possible for these macros.
+
+  ```nim
+  {.experimental: "typedTypeMacroPragma".}
+
+  import macros
+
+  macro foo(def: typed) =
+    assert def.kind == nnkTypeSection # previously nnkTypeDef
+    assert def.len == 1
+    assert def[0].kind == nnkTypeDef
+    result = def
+    
+  type Obj {.foo.} = object
+    x, y: int
+
+  let obj = Obj(x: 1, y: 2)
+  ```
+
+  To keep compatibility, macros can be updated to accept either one of
+  `nnkTypeDef` or `nnkTypeSection` as input. Note that these macros can
+  still only return `nnkTypeDef` or `nnkTypeSection` nodes. 
+
 
 ## Compiler changes
 
diff --git a/compiler/options.nim b/compiler/options.nim
index b77bdd2a3371..5736b8b2f8ce 100644
--- a/compiler/options.nim
+++ b/compiler/options.nim
@@ -229,6 +229,7 @@ type
     # alternative to above:
     genericsOpenSym
     vtables
+    typedTypeMacroPragma
 
   LegacyFeature* = enum
     allowSemcheckedAstModification,
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index f5f8fea0c608..8ce6d91926f4 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -1447,7 +1447,10 @@ proc typeDefLeftSidePass(c: PContext, typeSection: PNode, i: int) =
     s.typ = newTypeS(tyForward, c)
     s.typ.sym = s             # process pragmas:
     if name.kind == nkPragmaExpr:
-      let rewritten = applyTypeSectionPragmas(c, name[1], typeDef)
+      var macroArg = typeDef
+      if typedTypeMacroPragma in c.features:
+        macroArg = newTreeI(nkTypeSection, typeDef.info, typeDef)
+      let rewritten = applyTypeSectionPragmas(c, name[1], macroArg)
       if rewritten != nil:
         case rewritten.kind
         of nkTypeDef:
@@ -1712,8 +1715,8 @@ proc typeSectionRightSidePass(c: PContext, n: PNode) =
         obj.flags.incl sfPure
       obj.typ = objTy
       objTy.sym = obj
-  for sk in c.skipTypes:
-    discard semTypeNode(c, sk, nil)
+  for i in 0..<c.skipTypes.len:
+    discard semTypeNode(c, c.skipTypes[i], nil)
   c.skipTypes = @[]
 
 proc checkForMetaFields(c: PContext; n: PNode; hasError: var bool) =
diff --git a/doc/manual_experimental.md b/doc/manual_experimental.md
index da51d59ad1ec..2db4ebf3e96a 100644
--- a/doc/manual_experimental.md
+++ b/doc/manual_experimental.md
@@ -501,10 +501,13 @@ side of the definition. The macro can return either a type section or
 another `nnkTypeDef` node, both of which will replace the original row
 in the type section.
 
-In the future, this `nnkTypeDef` argument may be replaced with a unary
-type section node containing the type definition, or some other node that may
-be more convenient to work with. The ability to return nodes other than type
-definitions may also be supported, however currently this is not convenient
+With the experimental option `--experimental:typedTypeMacroPragma`,
+this `nnkTypeDef` argument is replaced with a unary type section node
+containing the type definition, which allows macros to receive the node
+as a `typed` argument.
+
+In the future, the ability to return nodes other than type definitions may
+also be supported, however currently this is not convenient
 when dealing with mutual type recursion. For now, macros can return an unused
 type definition where the right-hand node is of kind `nnkStmtListType`.
 Declarations in this node will be attached to the same scope as
diff --git a/tests/pragmas/tcustom_pragma.nim b/tests/pragmas/tcustom_pragma.nim
index 11a6df813d67..67f11bc7ebe1 100644
--- a/tests/pragmas/tcustom_pragma.nim
+++ b/tests/pragmas/tcustom_pragma.nim
@@ -332,6 +332,33 @@ TypeDef
 
   static: doAssert Baz.x is string
 
+  {.push experimental: "typedTypeMacroPragma".}
+
+  const typeAst2 = """
+TypeSection
+  TypeDef
+    PragmaExpr
+      Ident "Baz2"
+      Pragma
+    Empty
+    ObjectTy
+      Empty
+      Empty
+      RecList
+        IdentDefs
+          Ident "x"
+          Ident "string"
+          Empty
+"""
+
+  type
+    Baz2 {.expectedAst(typeAst2).} = object
+      x: string
+
+  static: doAssert Baz2.x is string
+
+  {.pop.}
+
   const procAst = """
 ProcDef
   Ident "bar"
diff --git a/tests/pragmas/ttypedef_macro.nim b/tests/pragmas/ttypedef_macro.nim
index dd4c8775700f..70f54ad361ff 100644
--- a/tests/pragmas/ttypedef_macro.nim
+++ b/tests/pragmas/ttypedef_macro.nim
@@ -1,7 +1,20 @@
+discard """
+  matrix: "; -d:typeSectionInput"
+"""
+
+const typeSectionInput = defined(typeSectionInput)
+
+when typeSectionInput:
+  {.experimental: "typedTypeMacroPragma".}
+
 import macros
 
 macro makeref(s): untyped =
-  expectKind s, nnkTypeDef
+  when typeSectionInput:
+    expectKind s, nnkTypeSection
+    let s = s[0]
+  else:
+    expectKind s, nnkTypeDef
   result = newTree(nnkTypeDef, s[0], s[1], newTree(nnkRefTy, s[2]))
 
 type
@@ -12,6 +25,11 @@ doAssert Obj is ref
 doAssert Obj(a: 3)[].a == 3
 
 macro multiply(amount: static int, s): untyped =
+  when typeSectionInput:
+    expectKind s, nnkTypeSection
+    let s = s[0]
+  else:
+    expectKind s, nnkTypeDef
   let name = $s[0].basename
   result = newNimNode(nnkTypeSection)
   for i in 1 .. amount:
@@ -32,6 +50,11 @@ doAssert not declared(Bar3)
 # https://github.com/nim-lang/RFCs/issues/219
 
 macro inferKind(td): untyped =
+  when typeSectionInput:
+    expectKind td, nnkTypeSection
+    let td = td[0]
+  else:
+    expectKind td, nnkTypeDef
   let name = $td[0].basename
   var rhs = td[2]
   while rhs.kind in {nnkPtrTy, nnkRefTy}: rhs = rhs[0]
diff --git a/tests/pragmas/ttypedef_macro_typed.nim b/tests/pragmas/ttypedef_macro_typed.nim
new file mode 100644
index 000000000000..d8895ddf991a
--- /dev/null
+++ b/tests/pragmas/ttypedef_macro_typed.nim
@@ -0,0 +1,49 @@
+discard """
+  nimout: '''
+TypeSection
+  TypeDef
+    PragmaExpr
+      Sym "X"
+      Pragma
+    Empty
+    ObjectTy
+      Empty
+      Empty
+      Empty
+'''
+"""
+
+import macros
+
+{.experimental: "typedTypeMacroPragma".}
+
+block: # changelog entry
+  macro foo(def: typed) =
+    doAssert def.kind == nnkTypeSection # previously nnkTypeDef
+    doAssert def.len == 1
+    doAssert def[0].kind == nnkTypeDef
+    result = def
+    
+  type Obj {.foo.} = object
+    x, y: int
+
+  let obj = Obj(x: 1, y: 2)
+
+block: # issue #18864
+  macro test(n: typed): untyped =
+    echo n.treeRepr
+    result = n
+
+  type
+    X {.test.} = object
+  var x = X()
+
+block: # issue #15334
+  macro entity(entityType: typed) =
+    result = entityType
+    
+  type
+    RootEntity = ref object of RootObj
+    Player {.entity.} = ref object of RootEntity
+      x, y: int
+  var foo = Player()