diff --git a/bin/cassandra.in.sh b/bin/cassandra.in.sh
index 61e7e86b77..d09b8468f6 100644
--- a/bin/cassandra.in.sh
+++ b/bin/cassandra.in.sh
@@ -32,7 +32,7 @@ cassandra_bin=$cassandra_home/build/classes
 # The java classpath (required)
 CLASSPATH=$CASSANDRA_CONF:$cassandra_bin
 
-for jar in $cassandra_home/lib/*.jar $cassandra_home/build/lib/*.jar; do
+for jar in $cassandra_home/lib/*.jar $cassandra_home/build/lib/jars/*.jar; do
     CLASSPATH=$CLASSPATH:$jar
 done
 
diff --git a/build.xml b/build.xml
index e0976e0419..64610ac5cd 100644
--- a/build.xml
+++ b/build.xml
@@ -131,8 +131,8 @@
     </target>
 
     <target name="ivy-retrieve" depends="ivy-download,ivy-init">
-      <ivy:retrieve type="jar" conf="default" sync="true"
-                    pattern="${build.dir.lib}/[artifact]-[revision].[ext]" />
+      <ivy:retrieve type="jar,source" conf="default" sync="true"
+             pattern="${build.dir.lib}/[type]s/[artifact]-[revision].[ext]" />
     </target>
 
     <!--