diff --git a/Configuration/TypoScript/Helpers/ParseFunc.typoscript b/Configuration/TypoScript/Helpers/ParseFunc.typoscript
index a000bad2..37f786e5 100755
--- a/Configuration/TypoScript/Helpers/ParseFunc.typoscript
+++ b/Configuration/TypoScript/Helpers/ParseFunc.typoscript
@@ -54,7 +54,7 @@ lib {
     parseFunc_RTE < lib.parseFunc
     parseFunc_RTE {
         # Processing <ol>, <ul> and <table> blocks separately
-        externalBlocks = article, aside, blockquote, div, dd, dl, footer, header, nav, ol, section, table, ul, pre, figure
+        externalBlocks = article, aside, blockquote, div, dd, dl, footer, header, nav, ol, section, table, ul, pre, figure, figcaption
         externalBlocks {
             ol {
                 stripNL = 1
@@ -108,6 +108,9 @@ lib {
             article < .div
             aside < .div
             figure < .div
+            figcaption {
+                stripNL = 1
+            }
             blockquote < .div
             footer < .div
             header < .div
@@ -115,6 +118,7 @@ lib {
             section < .div
             dl < .div
             dd < .div
+
         }
 
         nonTypoTagStdWrap {
diff --git a/Configuration/TypoScript/constants.typoscript b/Configuration/TypoScript/constants.typoscript
index d838cab8..45a08f83 100644
--- a/Configuration/TypoScript/constants.typoscript
+++ b/Configuration/TypoScript/constants.typoscript
@@ -1,5 +1,5 @@
 styles.content {
-    allowTags = a, abbr, acronym, address, article, aside, b, bdo, big, blockquote, br, caption, center, cite, code, col, colgroup, dd, del, dfn, dl, div, dt, em, font, footer, header, h1, h2, h3, h4, h5, h6, hr, i, img, ins, kbd, label, li, link, meta, nav, ol, p, pre, q, s, samp, sdfield, section, small, span, strike, strong, style, sub, sup, table, thead, tbody, tfoot, td, th, tr, title, tt, u, ul, var
+    allowTags = a, abbr, acronym, address, article, aside, b, bdo, big, blockquote, br, caption, center, cite, code, col, colgroup, dd, del, dfn, dl, div, dt, em, figcaption, figure, font, footer, header, h1, h2, h3, h4, h5, h6, hr, i, img, ins, kbd, label, li, link, mark, meta, nav, ol, p, pre, q, s, samp, sdfield, section, small, span, strike, strong, style, sub, sup, table, thead, tbody, tfoot, td, th, tr, title, tt, u, ul, var
     shortcut.tables = tt_content
 
     textmedia {