diff --git a/strip-frames.xsl b/strip-frames.xsl
index 06def1d7fb415418c1d8875d9cf65ae15bbdb515..27c28ad0e5a30318831055bd430b32af7cba29d2 100644
--- a/strip-frames.xsl
+++ b/strip-frames.xsl
@@ -29,6 +29,27 @@
         <xsl:attribute name="fo:line-height">0</xsl:attribute>
       </xsl:element>
     </xsl:element>
+    <!-- create a derived style for each paragraph we strip from around a frame,
+         which should be identical but for having a 0 line height -->
+    <xsl:for-each select="//text:p[draw:frame]">
+      <xsl:element name="style:style">
+        <xsl:variable name="style-name" select="@text:style-name"/>
+
+        <xsl:attribute name="style:family">paragraph</xsl:attribute>
+        <xsl:attribute name="style:name">
+          <xsl:value-of select="concat('Placeholder', $style-name)"/>
+        </xsl:attribute>
+        <xsl:attribute name="style:parent-style-name">
+          <xsl:value-of select="$style-name"/>
+        </xsl:attribute>
+        <!-- copy the original style:master-page-name attribute -->
+        <xsl:copy-of select="//office:automatic-styles/style:style[@style:name=$style-name]/@style:master-page-name"/>
+
+        <xsl:element name="style:paragraph-properties">
+          <xsl:attribute name="fo:line-height">0</xsl:attribute>
+        </xsl:element>
+      </xsl:element>
+    </xsl:for-each>
   </xsl:copy>
 </xsl:template>
 
@@ -48,7 +69,19 @@
 <xsl:template match="text:p[draw:frame]">
   <xsl:comment>Removed outer text:p</xsl:comment>
   <xsl:copy>
-    <xsl:apply-templates select="@*"/>
+    <!-- FIXME: there's probably a better way to do that -->
+    <xsl:for-each select="@*">
+      <xsl:choose>
+        <xsl:when test="../@text:style-name = .">
+          <xsl:attribute name="text:style-name">
+            <xsl:value-of select="concat('Placeholder', .)"/>
+          </xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="."/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
   </xsl:copy>
   <xsl:apply-templates/>
 </xsl:template>