diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index c494e32a7fc..5c89e5591c3 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -25,7 +25,7 @@
 		<div class="wrapper"><!-- for sticky footer -->
 			<div class="v-align"><!-- vertically centred box -->
 				<?php if ($_['bodyid'] === 'body-login' ): ?>
-					<header>
+					<header role="banner">
 						<div id="header">
 							<div class="logo svg">
 								<h1 class="hidden-visually">
@@ -40,7 +40,7 @@
 				<div class="push"></div><!-- for sticky footer -->
 			</div>
 		</div>
-		<footer>
+		<footer role="contentinfo">
 			<p class="info">
 				<?php print_unescaped($theme->getLongFooter()); ?>
 			</p>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 9667aa72ddb..4c804ed3ea8 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -35,7 +35,7 @@
 			<div id="update-notification" style="display: inline;"><a href="<?php print_unescaped($_['updateLink']); ?>"><?php p($l->t('%s is available. Get more information on how to update.', array($_['updateVersion']))); ?></a></div>
 		<?php endif; ?>
 	</div>
-	<header><div id="header">
+	<header role="banner"><div id="header">
 			<a href="<?php print_unescaped(link_to('', 'index.php')); ?>"
 				title="" id="owncloud" tabindex="-1">
 				<div class="logo-icon svg">
@@ -70,7 +70,7 @@
 					</div>
 					<?php endif; ?>
 					<span id="expandDisplayName"><?php  p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>
-					<img class="svg" alt="" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" />
+					<img class="svg" alt="" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>">
 				</div>
 				<div id="expanddiv">
 				<ul>
@@ -93,7 +93,7 @@
 				</div>
 			</div>
 
-			<form class="searchbox" action="#" method="post">
+			<form class="searchbox" action="#" method="post" role="search">
 				<label for="searchbox" class="hidden-visually">
 					<?php p($l->t('Search'));?>
 				</label>
@@ -103,7 +103,7 @@
 			</form>
 		</div></header>
 
-		<nav><div id="navigation">
+		<nav role="navigation"><div id="navigation">
 			<div id="apps" class="svg">
 				<ul>
 				<?php foreach($_['navigation'] as $entry): ?>
@@ -138,7 +138,7 @@
 		</div></nav>
 
 		<div id="content-wrapper">
-			<div id="content" class="app-<?php p($_['appid']) ?>">
+			<div id="content" class="app-<?php p($_['appid']) ?>" role="main">
 				<?php print_unescaped($_['content']); ?>
 			</div>
 		</div>