diff --git a/.gitignore b/.gitignore
index 1835801a3..7625933ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ gen
 local.properties
 ecbuild
 astrid/bin
+astrid/src-combined
 release
 dev
 lp-translations/
diff --git a/astrid/build.properties b/astrid/build.properties
index 5a5459665..252d7f977 100644
--- a/astrid/build.properties
+++ b/astrid/build.properties
@@ -5,7 +5,7 @@ out.dir=bin
 
 # source directory must be underneath output directory
 # because we pull in from multiple source folders
-source.dir=${out.dir}/source
+source.dir=src-combined
 
 # Astrid source folders
 astrid.sources=src,common-src,plugin-src,src-legacy,rmilk-src
diff --git a/astrid/build.xml b/astrid/build.xml
index ffd3cb19a..62bbb8a6a 100644
--- a/astrid/build.xml
+++ b/astrid/build.xml
@@ -100,13 +100,13 @@
       <echo>====== context classes without setContext =====</echo>
       <exec executable="sh">
         <arg value="-c" />
-        <arg value="cd bin/source; grep -L '\(setContext\|DependencyInjectionService\)' `grep -l -R '^\(public\).*class .* \(Activity\|Service\|BroadcastReceiver\)' .` | grep -v '.*\(CriteriaExposer\|DetailExposer\|Plugin\).java$' | grep -v rmilk" />
+        <arg value="cd ${source.dir}; grep -L '\(setContext\|DependencyInjectionService\)' `grep -l -R '^\(public\).*class .* \(Activity\|Service\|BroadcastReceiver\)' .` | grep -v '.*\(CriteriaExposer\|DetailExposer\|Plugin\).java$' | grep -v rmilk" />
       </exec>
       <echo />
       <echo>====== entry points without initializing Astrid DI =====</echo>
       <exec executable="sh">
         <arg value="-c" />
-        <arg value="cd bin/source; grep -L '\(AstridDependencyInjector\)' $(grep -l '@Autowired' `grep -l -R '^\(public\).*class .* \(Activity\|Service\|BroadcastReceiver\)' .`) | grep -v rmilk" />
+        <arg value="cd ${source.dir}; grep -L '\(AstridDependencyInjector\)' $(grep -l '@Autowired' `grep -l -R '^\(public\).*class .* \(Activity\|Service\|BroadcastReceiver\)' .`) | grep -v rmilk" />
       </exec>
     </target>