diff --git a/src/Composer/_defaultpages/Template/Details b/src/Composer/_defaultpages/Template/Details
new file mode 100644
index 0000000..21ceff7
--- /dev/null
+++ b/src/Composer/_defaultpages/Template/Details
@@ -0,0 +1,5 @@
+{{SimplePanel
+|type=info
+|title={{{headings|}}}
+|body={{{cql|}}}
+}}
\ No newline at end of file
diff --git a/src/Composer/_defaultpages/Template/DetailsSummary b/src/Composer/_defaultpages/Template/DetailsSummary
new file mode 100644
index 0000000..f15e86a
--- /dev/null
+++ b/src/Composer/_defaultpages/Template/DetailsSummary
@@ -0,0 +1,6 @@
+{| class="mw-collapsible mw-collapsed wikitable"
+! {{{title|}}}
+|-
+|
+{{{body|}}}
+|}
\ No newline at end of file
diff --git a/src/Composer/_defaultpages/Template/Excerpt b/src/Composer/_defaultpages/Template/Excerpt
index e69de29..f15e86a 100644
--- a/src/Composer/_defaultpages/Template/Excerpt
+++ b/src/Composer/_defaultpages/Template/Excerpt
@@ -0,0 +1,6 @@
+{| class="mw-collapsible mw-collapsed wikitable"
+! {{{title|}}}
+|-
+|
+{{{body|}}}
+|}
\ No newline at end of file
diff --git a/src/Converter/ConfluenceConverter.php b/src/Converter/ConfluenceConverter.php
index 4125a6a..2e70ea0 100644
--- a/src/Converter/ConfluenceConverter.php
+++ b/src/Converter/ConfluenceConverter.php
@@ -26,6 +26,8 @@
 use HalloWelt\MigrateConfluence\Converter\Processor\ConvertTaskListMacro;
 use HalloWelt\MigrateConfluence\Converter\Processor\ConvertTipMacro;
 use HalloWelt\MigrateConfluence\Converter\Processor\ConvertWarningMacro;
+use HalloWelt\MigrateConfluence\Converter\Processor\DetailsMacro;
+use HalloWelt\MigrateConfluence\Converter\Processor\DetailsSummaryMacro;
 use HalloWelt\MigrateConfluence\Converter\Processor\Emoticon;
 use HalloWelt\MigrateConfluence\Converter\Processor\ExpandMacro;
 use HalloWelt\MigrateConfluence\Converter\Processor\Image;
@@ -251,6 +253,8 @@ private function runProcessors( $dom ) {
 			),
 			new StructuredMacroContenByLabel( $this->currentPageTitle ),
 			new ExpandMacro(),
+			new DetailsMacro(),
+			new DetailsSummaryMacro(),
 			new MacroAlign(),
 			new StructuredMacroJira(),
 			new StructuredMacroViewFile(
diff --git a/src/Converter/Processor/DetailsMacro.php b/src/Converter/Processor/DetailsMacro.php
new file mode 100644
index 0000000..3268462
--- /dev/null
+++ b/src/Converter/Processor/DetailsMacro.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace HalloWelt\MigrateConfluence\Converter\Processor;
+
+/**
+ * <ac:structured-macro ac:name="details" ac:schema-version="1" ac:macro-id="...">
+ *   <ac:parameter ac:name="id">control</ac:parameter>
+ *     <ac:rich-text-body>
+ *       <h3>Control details</h3>
+ *       <table class="wrapped">
+ */
+class DetailsMacro extends ConvertMacroToTemplateBase {
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function getMacroName(): string {
+		return 'details';
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function getWikiTextTemplateName(): string {
+		return 'Details';
+	}
+}
diff --git a/src/Converter/Processor/DetailsSummaryMacro.php b/src/Converter/Processor/DetailsSummaryMacro.php
new file mode 100644
index 0000000..f3b30eb
--- /dev/null
+++ b/src/Converter/Processor/DetailsSummaryMacro.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace HalloWelt\MigrateConfluence\Converter\Processor;
+
+/**
+ * <ac:structured-macro ac:name="detailssummary" ac:schema-version="3" ac:macro-id="...">
+ *   <ac:parameter ac:name="firstcolumn">...</ac:parameter>
+ *   <ac:parameter ac:name="headings">...</ac:parameter>
+ *   <ac:parameter ac:name="sortBy">Title</ac:parameter>
+ *   <ac:parameter ac:name="cql">label = "..." and parent = currentContent ( )</ac:parameter>
+ * </ac:structured-macro>
+ */
+class DetailsSummaryMacro extends ConvertMacroToTemplateBase {
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function getMacroName(): string {
+		return 'detailssummary';
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function getWikiTextTemplateName(): string {
+		return 'DetailsSummary';
+	}
+}
diff --git a/tests/phpunit/Converter/Processor/DetailsMacroTest.php b/tests/phpunit/Converter/Processor/DetailsMacroTest.php
new file mode 100644
index 0000000..75535cf
--- /dev/null
+++ b/tests/phpunit/Converter/Processor/DetailsMacroTest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace HalloWelt\MigrateConfluence\Tests\Converter\Processor;
+
+use DOMDocument;
+use HalloWelt\MigrateConfluence\Converter\Processor\DetailsMacro;
+use PHPUnit\Framework\TestCase;
+
+class DetailsMacroTest extends TestCase {
+
+	/**
+	 * @var string
+	 */
+	private $dir = '';
+
+	/**
+	 * @covers HalloWelt\MigrateConfluence\Converter\Processor\DetailsMacro::process
+	 * @return void
+	 */
+	public function testProcess() {
+		$this->dir = dirname( dirname( __DIR__ ) ) . '/data';
+
+		$input = file_get_contents( "$this->dir/details-macro-input.xml" );
+
+		$dom = new DOMDocument();
+		$dom->loadXML( $input );
+
+		$processor = new DetailsMacro();
+		$processor->process( $dom );
+
+		$actualOutput = $dom->saveXML( $dom->documentElement );
+		$expectedOutput = file_get_contents( "$this->dir/details-macro-output.xml" );
+
+		$this->assertEquals( $expectedOutput, $actualOutput );
+	}
+
+}
diff --git a/tests/phpunit/Converter/Processor/DetailsSummaryMacroTest.php b/tests/phpunit/Converter/Processor/DetailsSummaryMacroTest.php
new file mode 100644
index 0000000..4d2c57a
--- /dev/null
+++ b/tests/phpunit/Converter/Processor/DetailsSummaryMacroTest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace HalloWelt\MigrateConfluence\Tests\Converter\Processor;
+
+use DOMDocument;
+use HalloWelt\MigrateConfluence\Converter\Processor\DetailsSummaryMacro;
+use PHPUnit\Framework\TestCase;
+
+class DetailsSummaryMacroTest extends TestCase {
+
+	/**
+	 * @var string
+	 */
+	private $dir = '';
+
+	/**
+	 * @covers HalloWelt\MigrateConfluence\Converter\Processor\DetailsSummaryMacro::process
+	 * @return void
+	 */
+	public function testProcess() {
+		$this->dir = dirname( dirname( __DIR__ ) ) . '/data';
+
+		$input = file_get_contents( "$this->dir/detailssummary-macro-input.xml" );
+
+		$dom = new DOMDocument();
+		$dom->loadXML( $input );
+
+		$processor = new DetailsSummaryMacro();
+		$processor->process( $dom );
+
+		$actualOutput = $dom->saveXML( $dom->documentElement );
+		$expectedOutput = file_get_contents( "$this->dir/detailssummary-macro-output.xml" );
+
+		$this->assertEquals( $expectedOutput, $actualOutput );
+	}
+
+}
diff --git a/tests/phpunit/data/details-macro-input.xml b/tests/phpunit/data/details-macro-input.xml
new file mode 100644
index 0000000..58a3801
--- /dev/null
+++ b/tests/phpunit/data/details-macro-input.xml
@@ -0,0 +1,8 @@
+<xml xmlns:ac="sample_namespace">
+    <ac:structured-macro ac:name="details">
+      <ac:parameter ac:name="id">Lorem</ac:parameter>
+      <ac:rich-text-body>
+        <h3>Ipsum dolor</h3>
+      </ac:rich-text-body>
+    </ac:structured-macro>
+</xml>
\ No newline at end of file
diff --git a/tests/phpunit/data/details-macro-output.xml b/tests/phpunit/data/details-macro-output.xml
new file mode 100644
index 0000000..6352641
--- /dev/null
+++ b/tests/phpunit/data/details-macro-output.xml
@@ -0,0 +1,9 @@
+<xml xmlns:ac="sample_namespace">
+    {{Details###BREAK###
+ |id = Lorem###BREAK###
+ |body = ###BREAK###
+
+        <h3>Ipsum dolor</h3>
+      }}###BREAK###
+
+</xml>
\ No newline at end of file
diff --git a/tests/phpunit/data/detailssummary-macro-input.xml b/tests/phpunit/data/detailssummary-macro-input.xml
new file mode 100644
index 0000000..1e6c674
--- /dev/null
+++ b/tests/phpunit/data/detailssummary-macro-input.xml
@@ -0,0 +1,8 @@
+<xml xmlns:ac="sample_namespace">
+    <ac:structured-macro ac:name="detailssummary">
+        <ac:parameter ac:name="firstcolumn">Col 1</ac:parameter>
+        <ac:parameter ac:name="headings">Heading 1, Heading 2, Heading 3, Heading 4</ac:parameter>
+        <ac:parameter ac:name="sortBy">Title</ac:parameter>
+        <ac:parameter ac:name="cql">label = "Label 1" and parent = currentContent ( )</ac:parameter>
+      </ac:structured-macro>
+</xml>
\ No newline at end of file
diff --git a/tests/phpunit/data/detailssummary-macro-output.xml b/tests/phpunit/data/detailssummary-macro-output.xml
new file mode 100644
index 0000000..876a886
--- /dev/null
+++ b/tests/phpunit/data/detailssummary-macro-output.xml
@@ -0,0 +1,9 @@
+<xml xmlns:ac="sample_namespace">
+    {{DetailsSummary###BREAK###
+ |firstcolumn = Col 1###BREAK###
+ |headings = Heading 1, Heading 2, Heading 3, Heading 4###BREAK###
+ |sortBy = Title###BREAK###
+ |cql = label = "Label 1" and parent = currentContent ( )###BREAK###
+}}###BREAK###
+
+</xml>
\ No newline at end of file