diff --git a/.travis.yml b/.travis.yml
index e937558e0f..0d02b1747f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,16 @@
 language: java
+sudo: false
+install: true
+
 jdk:
   - oraclejdk7
+
 script:
  - "cd build"
  - "ant rebuild"
+ - "cd $TRAVIS_BUILD_DIR"
+ - ./runSonarQubeAnalysis.sh
+
+cache:
+  directories:
+    - '$HOME/.sonar/cache'
\ No newline at end of file
diff --git a/README.md b/README.md
index e419ac929b..0992c55940 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Restlet Framework
 
+[![Build status](https://travis-ci.org/restlet/restlet-framework-java.svg?branch=2.3)](https://travis-ci.org/restlet/restlet-framework-java) [![Quality Gate](https://nemo.sonarqube.org/api/badges/gate?key=restlet-framework-java)](https://nemo.sonarqube.org/dashboard/index/restlet-framework-java)
+
 ## The leading RESTful Web API framework for Java
 
 Thanks to Restlet Framework's powerful routing and filtering capabilities, unified client and server Java API, developers can build secure and scalable RESTful web APIs.
@@ -24,5 +26,3 @@ To learn more about Restlet Framework, please have a look at the following resou
 * [Stack Overflow](http://stackoverflow.com/questions/tagged/restlet)
 
 Copyright 2015 Restlet
-
-[![Build Status](https://travis-ci.org/restlet/restlet-framework-java.svg?branch=2.3)](https://travis-ci.org/restlet/restlet-framework-java)
diff --git a/runSonarQubeAnalysis.sh b/runSonarQubeAnalysis.sh
new file mode 100755
index 0000000000..cee65703dd
--- /dev/null
+++ b/runSonarQubeAnalysis.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# Exit on failure
+set -e
+
+# This assumes that the 2 following variables are defined:
+# - SONAR_HOST_URL => should point to the public URL of the SQ server (e.g. for Nemo: https://nemo.sonarqube.org)
+# - SONAR_TOKEN    => token of a user who has the "Execute Analysis" permission on the SQ server
+
+installSonarQubeScanner() {
+	export SONAR_SCANNER_HOME=$HOME/.sonar/sonar-scanner-2.6
+	rm -rf $SONAR_SCANNER_HOME
+	mkdir -p $SONAR_SCANNER_HOME
+	curl -sSLo $HOME/.sonar/sonar-scanner.zip http://repo1.maven.org/maven2/org/sonarsource/scanner/cli/sonar-scanner-cli/2.6/sonar-scanner-cli-2.6.zip
+	unzip $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
+	rm $HOME/.sonar/sonar-scanner.zip
+	export PATH=$SONAR_SCANNER_HOME/bin:$PATH
+	export SONAR_SCANNER_OPTS="-server -Xmx1G -Xms128m"
+}
+
+# Install the SonarQube Scanner
+# TODO: Would be nice to have it pre-installed by Travis somehow
+installSonarQubeScanner
+
+# And run the analysis
+# It assumes that there's a sonar-project.properties file at the root of the repo
+if [ "$TRAVIS_BRANCH" = "2.3" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
+	# => This will run a full analysis of the project and push results to the SonarQube server.
+	#
+	# Analysis is done only on branch "2.3" (which seems to be the main developement branch for the moment) 
+	# so that build of branches don't push analyses to the same project and therefore "pollute" the results
+	echo "Starting analysis by SonarQube..."
+	sonar-scanner \
+		-Dsonar.host.url=$SONAR_HOST_URL \
+		-Dsonar.login=$SONAR_TOKEN
+
+elif [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ -n "${GITHUB_TOKEN-}" ]; then
+	# => This will analyse the PR and display found issues as comments in the PR, but it won't push results to the SonarQube server
+	#
+    # For security reasons environment variables are not available on the pull requests
+    # coming from outside repositories
+    # http://docs.travis-ci.com/user/pull-requests/#Security-Restrictions-when-testing-Pull-Requests
+    # That's why the analysis does not need to be executed if the variable GITHUB_TOKEN is not defined.
+	echo "Starting Pull Request analysis by SonarQube..."
+	sonar-scanner \
+		-Dsonar.host.url=$SONAR_HOST_URL \
+		-Dsonar.login=$SONAR_TOKEN \
+		-Dsonar.analysis.mode=preview \
+		-Dsonar.github.oauth=$GITHUB_TOKEN \
+		-Dsonar.github.repository=$TRAVIS_REPO_SLUG \
+		-Dsonar.github.pullRequest=$TRAVIS_PULL_REQUEST
+fi
+# When neither on master branch nor on a non-external pull request => nothing to do
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 0000000000..1f47e2dc50
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,16 @@
+sonar.projectKey=restlet-framework-java
+sonar.projectVersion=2.3-SNAPSHOT
+sonar.projectName=Restlet Framework
+
+# Configuration of sources
+sonar.sources=modules
+# let's analyse only Java files for the moment
+sonar.inclusions=**/src/**/*.java
+# but exclude the code used for the examples
+sonar.exclusions=**/org.restlet.example*/**
+
+# Other useful information for SonarQube
+sonar.links.homepage=http://restlet.com
+sonar.links.ci=https://travis-ci.org/restlet/restlet-framework-java
+sonar.links.scm=https://github.com/restlet/restlet-framework-java
+sonar.links.issue=https://github.com/restlet/restlet-framework-java/issues