diff --git a/src/main/webapp/WEB-INF/decorator/entry.jsp b/src/main/webapp/WEB-INF/decorator/entry.jsp
index bc8077f328d20629d32daacc78be026cc49c2a9a..2219c6583b0985ea9ac09793f9ea1e6f604d54a6 100644
--- a/src/main/webapp/WEB-INF/decorator/entry.jsp
+++ b/src/main/webapp/WEB-INF/decorator/entry.jsp
@@ -15,7 +15,20 @@
     <!-- default header name is X-CSRF-TOKEN -->
     <meta name="_csrf_header" content="${_csrf.headerName}"/>
 
+	<!-- Links -->
 	<link rel="shortcut icon" href="<c:url value="/genesys.png" />" />
+
+	<!-- l10n -->
+	<link rel="alternate" hreflang="en" href="<c:url value="?${pageContext.request.queryString}"><c:param name="lang" value="en" /></c:url>" />
+	<link rel="alternate" hreflang="ar" href="<c:url value="?${pageContext.request.queryString}"><c:param name="lang" value="ar" /></c:url>" />
+	<link rel="alternate" hreflang="de" href="<c:url value="?${pageContext.request.queryString}"><c:param name="lang" value="de" /></c:url>" />
+	<link rel="alternate" hreflang="es" href="<c:url value="?${pageContext.request.queryString}"><c:param name="lang" value="es" /></c:url>" />
+	<link rel="alternate" hreflang="fa" href="<c:url value="?${pageContext.request.queryString}"><c:param name="lang" value="fa" /></c:url>" />
+	<link rel="alternate" hreflang="fr" href="<c:url value="?${pageContext.request.queryString}"><c:param name="lang" value="fr" /></c:url>" />
+	<link rel="alternate" hreflang="pt" href="<c:url value="?${pageContext.request.queryString}"><c:param name="lang" value="pt" /></c:url>" />
+	<link rel="alternate" hreflang="ru" href="<c:url value="?${pageContext.request.queryString}"><c:param name="lang" value="ru" /></c:url>" />
+	<link rel="alternate" hreflang="zh" href="<c:url value="?${pageContext.request.queryString}"><c:param name="lang" value="zh" /></c:url>" />
+
     <title><sitemesh:write property="title" /></title>
 
     <!-- Custom styles for this template -->
diff --git a/src/main/webapp/WEB-INF/decorator/main.jsp b/src/main/webapp/WEB-INF/decorator/main.jsp
index 9f4b2a50334f0360ed5c77df83da01ef73e849d7..661e59f8c34a5399ee484308441a2bb98905a514 100644
--- a/src/main/webapp/WEB-INF/decorator/main.jsp
+++ b/src/main/webapp/WEB-INF/decorator/main.jsp
@@ -13,13 +13,27 @@
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-
+    <meta name="description" content="Genesys, global database on plant genetic resources, accession database, order seeds, request for genebank material" />
+    <meta name="author" content="Global Crop Diversity Trust" />
+    
     <!-- CSRF protection-->
     <meta name="_csrf" content="${_csrf.token}"/>
     <!-- default header name is X-CSRF-TOKEN -->
     <meta name="_csrf_header" content="${_csrf.headerName}"/>
 
+	<!-- Links -->
 	<link rel="shortcut icon" href="<c:url value="/genesys.png" />" />
+	
+	<!-- l10n -->
+	<link rel="alternate" hreflang="en" href="<c:url value="?${pageContext.request.queryString}"><c:param name="lang" value="en" /></c:url>" />
+	<link rel="alternate" hreflang="ar" href="<c:url value="?${pageContext.request.queryString}"><c:param name="lang" value="ar" /></c:url>" />
+	<link rel="alternate" hreflang="de" href="<c:url value="?${pageContext.request.queryString}"><c:param name="lang" value="de" /></c:url>" />
+	<link rel="alternate" hreflang="es" href="<c:url value="?${pageContext.request.queryString}"><c:param name="lang" value="es" /></c:url>" />
+	<link rel="alternate" hreflang="fa" href="<c:url value="?${pageContext.request.queryString}"><c:param name="lang" value="fa" /></c:url>" />
+	<link rel="alternate" hreflang="fr" href="<c:url value="?${pageContext.request.queryString}"><c:param name="lang" value="fr" /></c:url>" />
+	<link rel="alternate" hreflang="pt" href="<c:url value="?${pageContext.request.queryString}"><c:param name="lang" value="pt" /></c:url>" />
+	<link rel="alternate" hreflang="ru" href="<c:url value="?${pageContext.request.queryString}"><c:param name="lang" value="ru" /></c:url>" />
+	<link rel="alternate" hreflang="zh" href="<c:url value="?${pageContext.request.queryString}"><c:param name="lang" value="zh" /></c:url>" />
 
     <title><sitemesh:write property="title" /></title>