diff --git a/build.xml b/build.xml
index 310c874fe5..c5e6301272 100644
--- a/build.xml
+++ b/build.xml
@@ -180,15 +180,21 @@
       <tar compression="gzip" longfile="gnu"
         destfile="${build.dir}/${final.name}-bin.tar.gz">
 
-        <tarfileset dir="${dist.dir}"
-          prefix="${final.name}">
+        <!-- Everything but bin/ (default mode) -->
+        <tarfileset dir="${dist.dir}" prefix="${final.name}">
           <include name="**"/>
-          <exclude name="bin/cassandra" />
+          <exclude name="bin/*" />
         </tarfileset>
-        <tarfileset dir="${dist.dir}"
-          prefix="${final.name}"
-          mode="755">
-          <include name="bin/cassandra"/>
+        <!-- Shell includes in bin/ (default mode) -->
+        <tarfileset dir="${dist.dir}" prefix="${final.name}">
+          <include name="bin/*.in.sh" />
+        </tarfileset>
+        <!-- Executable scripts in bin/ -->
+        <tarfileset dir="${dist.dir}" prefix="${final.name}" mode="755">
+          <include name="bin/*"/>
+          <not>
+        	<filename name="bin/*.in.sh" />
+          </not>
         </tarfileset>	
       </tar>
       <tar compression="gzip" longfile="gnu"
diff --git a/test/conf/log4j.properties b/test/conf/log4j.properties
index 6c36ef6269..914414d895 100644
--- a/test/conf/log4j.properties
+++ b/test/conf/log4j.properties
@@ -14,12 +14,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# for production, you should probably set the root to INFO
+# and the pattern to %c instead of %l.  (%l is slower.)
 
-log4j.rootLogger=DEBUG,R
+# output messages into a rolling log file as well as stdout
+log4j.rootLogger=DEBUG,stdout,R
+
+# stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.SimpleLayout
 
 # rolling log file ("system.log
 log4j.appender.R=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.R.DatePattern='.'yyyy-MM-dd-HH
 log4j.appender.R.layout=org.apache.log4j.PatternLayout
 log4j.appender.R.layout.ConversionPattern=%5p [%t] %d{ISO8601} %F (line %L) %m%n
-log4j.appender.R.File=build/test/logs/system.log
+# Edit the next line to point to your logs directory
+log4j.appender.R.File=/var/cassandra/logs/system.log
+
+# Application logging options
+#log4j.logger.com.facebook=DEBUG
+#log4j.logger.com.facebook.infrastructure.gms=DEBUG
+#log4j.logger.com.facebook.infrastructure.db=DEBUG