diff --git a/phpBB/styles/prosilver/template/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html
index b37ba238d2..54922620c4 100644
--- a/phpBB/styles/prosilver/template/bbcode.html
+++ b/phpBB/styles/prosilver/template/bbcode.html
@@ -13,6 +13,9 @@
 <!-- BEGIN quote_close --></div></blockquote><!-- END quote_close -->
 <!-- BEGIN quote_extended -->
 <blockquote>
+	<xsl:if test="@post_url">
+		<xsl:attribute name="cite"><xsl:value-of select="@post_url"/></xsl:attribute>
+	</xsl:if>
 	<xsl:if test="not(@author)">
 		<xsl:attribute name="class">uncited</xsl:attribute>
 	</xsl:if>
@@ -42,7 +45,7 @@
 					<a href="{@msg_url}" data-msg-id="{@msg_id}">&#8593;</a>
 				</xsl:if>
 				<xsl:if test="@date">
-					<div class="responsive-hide"><xsl:value-of select="@date"/></div>
+					<span class="responsive-hide"><xsl:value-of select="@date"/></span>
 				</xsl:if>
 			</cite>
 		</xsl:if>
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 90c0b2b54b..0db018b312 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -534,7 +534,7 @@ blockquote cite:before,
 	padding-right: 5px;
 }
 
-blockquote cite > div {
+blockquote cite > span {
 	font-weight: normal;
 	float: right;
 }
diff --git a/tests/text_formatter/s9e/default_formatting_test.php b/tests/text_formatter/s9e/default_formatting_test.php
index 157af196d9..6c81fc5a4d 100644
--- a/tests/text_formatter/s9e/default_formatting_test.php
+++ b/tests/text_formatter/s9e/default_formatting_test.php
@@ -279,7 +279,7 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
 			),
 			array(
 				'[quote=Username post_id=123]...[/quote]',
-				'<blockquote><div><cite>Username wrote: <a href="phpBB/viewtopic.php?p=123#p123" data-post-id="123" onclick="if(document.getElementById(hash.substr(1)))href=hash">↑</a></cite>...</div></blockquote>'
+				'<blockquote cite="phpBB/viewtopic.php?p=123#p123"><div><cite>Username wrote: <a href="phpBB/viewtopic.php?p=123#p123" data-post-id="123" onclick="if(document.getElementById(hash.substr(1)))href=hash">↑</a></cite>...</div></blockquote>'
 			),
 			array(
 				// Users are not allowed to submit their own URL for the post
@@ -288,7 +288,7 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
 			),
 			array(
 				'[quote=Username time=58705871]...[/quote]',
-				'<blockquote><div><cite>Username wrote:<div class="responsive-hide">1971-11-11 11:11:11</div></cite>...</div></blockquote>'
+				'<blockquote><div><cite>Username wrote:<span class="responsive-hide">1971-11-11 11:11:11</span></cite>...</div></blockquote>'
 			),
 			array(
 				'[quote=Username user_id=123]...[/quote]',
diff --git a/tests/text_formatter/s9e/fixtures/styles/prosilver/template/bbcode.html b/tests/text_formatter/s9e/fixtures/styles/prosilver/template/bbcode.html
index 22be395499..6544b43bfd 100644
--- a/tests/text_formatter/s9e/fixtures/styles/prosilver/template/bbcode.html
+++ b/tests/text_formatter/s9e/fixtures/styles/prosilver/template/bbcode.html
@@ -13,6 +13,9 @@
 {% for quote_close in loops.quote_close %}</div></blockquote>{% endfor %}
 {% for quote_extended in loops.quote_extended %}
 <blockquote>
+	<xsl:if test="@post_url">
+		<xsl:attribute name="cite"><xsl:value-of select="@post_url"/></xsl:attribute>
+	</xsl:if>
 	<xsl:if test="not(@author)">
 		<xsl:attribute name="class">uncited</xsl:attribute>
 	</xsl:if>
@@ -38,7 +41,7 @@
 					<a href="{@post_url}" data-post-id="{@post_id}" onclick="if(document.getElementById(hash.substr(1)))href=hash">&#8593;</a>
 				</xsl:if>
 				<xsl:if test="@date">
-					<div class="responsive-hide"><xsl:value-of select="@date"/></div>
+					<span class="responsive-hide"><xsl:value-of select="@date"/></span>
 				</xsl:if>
 			</cite>
 		</xsl:if>