diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml
index 7a305322a6..f087617709 100644
--- a/spring-boot/pom.xml
+++ b/spring-boot/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.1.RELEASE</version>
+        <version>1.5.2.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
diff --git a/spring-boot/src/main/java/com/baeldung/internationalization/InternationalizationApp.java b/spring-boot/src/main/java/com/baeldung/internationalization/InternationalizationApp.java
new file mode 100644
index 0000000000..c92d1c32e6
--- /dev/null
+++ b/spring-boot/src/main/java/com/baeldung/internationalization/InternationalizationApp.java
@@ -0,0 +1,15 @@
+package com.baeldung.internationalization;
+
+import javax.annotation.security.RolesAllowed;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class InternationalizationApp {
+    @RolesAllowed("*")
+    public static void main(String[] args) {
+        System.setProperty("security.basic.enabled", "false");
+        SpringApplication.run(InternationalizationApp.class, args);
+    }
+}
diff --git a/spring-boot/src/main/java/com/baeldung/internationalization/config/MvcConfig.java b/spring-boot/src/main/java/com/baeldung/internationalization/config/MvcConfig.java
new file mode 100644
index 0000000000..59f7fd3ba5
--- /dev/null
+++ b/spring-boot/src/main/java/com/baeldung/internationalization/config/MvcConfig.java
@@ -0,0 +1,38 @@
+package com.baeldung.internationalization.config;
+
+import java.util.Locale;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
+import org.springframework.web.servlet.i18n.SessionLocaleResolver;
+
+@Configuration
+@EnableWebMvc
+@ComponentScan(basePackages = "com.baeldung.internationalization.config")
+public class MvcConfig extends WebMvcConfigurerAdapter {
+
+    @Bean
+    public LocaleResolver localeResolver() {
+        SessionLocaleResolver slr = new SessionLocaleResolver();
+        slr.setDefaultLocale(Locale.US);
+        return slr;
+    }
+
+    @Bean
+    public LocaleChangeInterceptor localeChangeInterceptor() {
+        LocaleChangeInterceptor lci = new LocaleChangeInterceptor();
+        lci.setParamName("lang");
+        return lci;
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(localeChangeInterceptor());
+    }
+}
diff --git a/spring-boot/src/main/java/com/baeldung/internationalization/config/PageController.java b/spring-boot/src/main/java/com/baeldung/internationalization/config/PageController.java
new file mode 100644
index 0000000000..96a534b853
--- /dev/null
+++ b/spring-boot/src/main/java/com/baeldung/internationalization/config/PageController.java
@@ -0,0 +1,14 @@
+package com.baeldung.internationalization.config;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class PageController {
+
+    @GetMapping("/international")
+    public String getInternationalPage() {
+        return "international";
+    }
+
+}
diff --git a/spring-boot/src/main/resources/messages.properties b/spring-boot/src/main/resources/messages.properties
new file mode 100644
index 0000000000..e4dbc44c3f
--- /dev/null
+++ b/spring-boot/src/main/resources/messages.properties
@@ -0,0 +1,4 @@
+greeting=Hello! Welcome to our website!
+lang.change=Change the language
+lang.eng=English
+lang.fr=French
\ No newline at end of file
diff --git a/spring-boot/src/main/resources/messages_fr.properties b/spring-boot/src/main/resources/messages_fr.properties
new file mode 100644
index 0000000000..ac5853717d
--- /dev/null
+++ b/spring-boot/src/main/resources/messages_fr.properties
@@ -0,0 +1,4 @@
+greeting=Bonjour! Bienvenue sur notre site!
+lang.change=Changez la langue
+lang.eng=Anglais
+lang.fr=Francais
\ No newline at end of file
diff --git a/spring-boot/src/main/resources/templates/international.html b/spring-boot/src/main/resources/templates/international.html
new file mode 100644
index 0000000000..a2a5fbb591
--- /dev/null
+++ b/spring-boot/src/main/resources/templates/international.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+<meta charset="ISO-8859-1" />
+<title>Home</title>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+    $("#locales").change(function () {
+        var selectedOption = $('#locales').val();
+        if (selectedOption != ''){
+            window.location.replace('international?lang=' + selectedOption);
+        }
+    });
+});
+</script>
+</head>
+<body>
+<h1 th:text="#{greeting}"></h1>
+
+<br /><br />
+<span th:text="#{lang.change}"></span>:
+<select id="locales">
+    <option value=""></option>
+    <option value="en" th:text="#{lang.eng}"></option>
+    <option value="fr" th:text="#{lang.fr}"></option>
+</select>
+</body>
+</html>
\ No newline at end of file