diff --git a/pom.xml b/pom.xml
index 5285ab1..b31f98a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
+		<jsf.version>2.2.14</jsf.version>
 	</properties>
 
 	<dependencies>
@@ -58,6 +59,18 @@
 			<groupId>javax.servlet</groupId>
 			<artifactId>jstl</artifactId>
 		</dependency>
+		
+		<!-- JSF dependencies-->
+		<dependency>
+			<groupId>com.sun.faces</groupId>
+			<artifactId>jsf-api</artifactId>
+			<version>${jsf.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.faces</groupId>
+			<artifactId>jsf-impl</artifactId>
+			<version>${jsf.version}</version>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/src/main/java/eu/arima/JSFConfiguration.java b/src/main/java/eu/arima/JSFConfiguration.java
new file mode 100644
index 0000000..0b05c3a
--- /dev/null
+++ b/src/main/java/eu/arima/JSFConfiguration.java
@@ -0,0 +1,27 @@
+package eu.arima;
+
+import javax.faces.webapp.FacesServlet;
+
+import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.sun.faces.config.ConfigureListener;
+
+@Configuration
+public class JSFConfiguration {
+	
+	@Bean
+	public ServletRegistrationBean facesServletRegistration() {
+		ServletRegistrationBean registration = new ServletRegistrationBean(new FacesServlet(), "*.xhtml");
+		registration.setName("FacesServlet");
+		registration.setLoadOnStartup(1);
+		return registration;
+	}
+
+	@Bean
+	public ServletListenerRegistrationBean<ConfigureListener> jsfConfigureListener() {
+		return new ServletListenerRegistrationBean<ConfigureListener>(new ConfigureListener());
+	}
+}
diff --git a/src/main/java/eu/arima/beans/JsfBean.java b/src/main/java/eu/arima/beans/JsfBean.java
new file mode 100644
index 0000000..f6e9421
--- /dev/null
+++ b/src/main/java/eu/arima/beans/JsfBean.java
@@ -0,0 +1,30 @@
+package eu.arima.beans;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class JsfBean {
+
+	private String message;
+
+	private List<String> list;
+
+	public JsfBean() {
+		this.message = "Hello Arima!!!";
+		this.list = new ArrayList<>();
+		for (int i = 0; i < 10; i++) {
+			this.list.add("Message " + i);
+		}
+	}
+
+	public String getMensaje() {
+		return this.message;
+	}
+
+	public List<String> getList() {
+		return this.list;
+	}
+}
diff --git a/src/main/webapp/WEB-INF/faces-config.xml b/src/main/webapp/WEB-INF/faces-config.xml
new file mode 100644
index 0000000..b20a905
--- /dev/null
+++ b/src/main/webapp/WEB-INF/faces-config.xml
@@ -0,0 +1,5 @@
+<faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd" version="2.2">
+        <application>
+            <el-resolver>org.springframework.web.jsf.el.SpringBeanFacesELResolver</el-resolver>
+        </application>
+</faces-config>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..7add154
--- /dev/null
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+		xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+        http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+		id="WebApp_ID" version="3.0">
+	
+    <servlet>
+        <servlet-name>FacesServlet</servlet-name>
+        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+    </servlet>
+    
+</web-app>
\ No newline at end of file
diff --git a/src/main/webapp/jsf/hello.xhtml b/src/main/webapp/jsf/hello.xhtml
new file mode 100644
index 0000000..298a25c
--- /dev/null
+++ b/src/main/webapp/jsf/hello.xhtml
@@ -0,0 +1,21 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:c="http://java.sun.com/jsp/jstl/core">
+
+<h:head>
+	<title>Login</title>
+</h:head>
+<h:body>
+
+	<h1>
+		<h:outputText value="#{jsfBean.mensaje}" />
+	</h1>
+
+	<c:forEach var="message" items="#{jsfBean.list}">
+		<h:outputText value="#{message}" />
+		<br/>
+	</c:forEach>
+
+</h:body>
+
+</html>
\ No newline at end of file