diff --git a/sonar-project.properties b/sonar-project.properties
index d7e82ee..b465fd1 100755
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -37,19 +37,32 @@
 sonar.cxx.cppcheck.reportPath=cppcheck-result.xml
 
 # List of the module identifiers
-sonar.modules=module1,module2,module3,module4,module5,module6,module7,module8,module9,module10,module11,module12,module13,module14,module15
- 
+sonar.modules=module1,module3,module4,module5,module6,module7,module8,module9,module10,module11,module12,module14
+
+
+
+# we need sonar-runner 2.1 for this, see http://jira.codehaus.org/browse/SONARPLUGINS-2421
+#sonar.modules=module2
+
+# delph plugin is broken
+#sonar.modules=module13
+
+# phpunit plugin is broken
+#sonar.modules=module15
+
 module1.sonar.projectName=Apache Thrift - Java Library
 module1.sonar.projectBaseDir=lib/java
 module1.sonar.sources=src
 module1.sonar.tests=test
-#module1.sonar.binaries=build
-#module1.sonar.libraries=build/lib
+module1.sonar.binaries=build/libthrift-1.0.0.jar
+module1.sonar.libraries=build/lib/*.jar
 module1.sonar.language=java
 
 module2.sonar.projectName=Apache Thrift - Java Tutorial
-module2.sonar.projectBaseDir=tutorial/java
-module2.sonar.sources=src
+module2.sonar.projectBaseDir=.
+module2.sonar.sources=tutorial/java/src, tutorial/java/gen-java
+module2.sonar.binaries=tutorial/java/tutorial.jar
+module2.sonar.libraries=lib/java/build/lib/*.jar,lib/java/build/libthrift-1.0.0.jar
 module2.sonar.language=java
 
 module3.sonar.projectName=Apache Thrift - JavaScript Library