diff --git a/readme.md b/readme.md
index 5911e2764..945e1ed78 100644
--- a/readme.md
+++ b/readme.md
@@ -1,5 +1,4 @@
-# Spring PetClinic Sample Application
-
+# Spring Boot version of the Spring PetClinic Sample Application [![Build Status](https://travis-ci.org/spring-projects/spring-petclinic.png?branch=master)](https://travis-ci.org/spring-projects/spring-petclinic/)
## Understanding the Spring Petclinic application with a few diagrams
See the presentation here
@@ -7,12 +6,151 @@
## Running petclinic locally
```
git clone https://github.com/spring-projects/spring-petclinic.git
- mvn spring-boot:run
+ cd spring-petclinic
+ git checkout angularjs
+ ./mvnw clean install
+ cd spring-petclinic-server
+ ./mvnw spring-boot:run
```
-You can then access petclinic here: http://localhost:8080
+You can then access petclinic here: http://localhost:8080/
## In case you find a bug/suggested improvement for Spring Petclinic
Our issue tracker is available here: https://github.com/spring-projects/spring-petclinic/issues
+## Database configuration
+
+In its default configuration, Petclinic uses an in-memory database (HSQLDB) which
+gets populated at startup with data. A similar setup is provided for MySql in case a persistent database configuration is needed.
+Note that whenever the database type is changed, the data-access.properties file needs to be updated and the mysql-connector-java artifact from the pom.xml needs to be uncommented.
+
+You may start a MySql database with docker:
+
+```
+docker run -e MYSQL_ROOT_PASSWORD=petclinic -e MYSQL_DATABASE=petclinic -p 3306:3306 mysql:5.7.8
+```
+
+## Working with Petclinic in Eclipse/STS
+
+### prerequisites
+The following items should be installed in your system:
+* Maven 3 (http://www.sonatype.com/books/mvnref-book/reference/installation.html)
+* git command line tool (https://help.github.com/articles/set-up-git)
+* Eclipse with the m2e plugin (m2e is installed by default when using the STS (http://www.springsource.org/sts) distribution of Eclipse)
+
+Note: when m2e is available, there is an m2 icon in Help -> About dialog.
+If m2e is not there, just follow the install process here: http://eclipse.org/m2e/download/
+
+
+### Steps:
+
+1) In the command line
+```
+git clone https://github.com/spring-projects/spring-petclinic.git
+```
+2) Inside Eclipse
+```
+File -> Import -> Maven -> Existing Maven project
+```
+
+## Client-side Architecture
+
+Compared to the [standard Petclinic based on JSP pages](https://github.com/spring-projects/spring-petclinic),
+this SpringBoot AngularJS Petclinic is splitted in 2 modules - a client module and a server module:
+* springboot-petclinic-client : static resources (images, fonts, style, angular JS code) packaged as a webjar.
+* springboot-petclinic-server : Spring MVC REST API and an index.html template
+
+
+## Looking for something in particular?
+
+
+
+
+
+
+
+
+## Interaction with other open source projects
+
+One of the best parts about working on the Spring Petclinic application is that we have the opportunity to work in direct contact with many Open Source projects. We found some bugs/suggested improvements on various topics such as Spring, Spring Data, Bean Validation and even Eclipse! In many cases, they've been fixed/implemented in just a few days.
+Here is a list of them:
+
+
+
+ Name |
+ Issue |
+
+
+ Bean Validation / Hibernate Validator: simplify Maven dependencies and backward compatibility |
+
+ HV-790 and HV-792
+ |
+
+
+ Spring Data: provide more flexibility when working with JPQL queries |
+
+ DATAJPA-292
+ |
+
+
+
+
+# Contributing
+
+The [issue tracker](https://github.com/spring-projects/spring-petclinic/issues) is the preferred channel for bug reports, features requests and submitting pull requests.
+
+For pull requests, editor preferences are available in the [editor config](https://github.com/spring-projects/spring-petclinic/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at .
+