diff --git a/build_java.pl b/build_java.pl
index 52bb3492..710e89da 100644
--- a/build_java.pl
+++ b/build_java.pl
@@ -160,11 +160,22 @@ sub setup_vars {
     }
     $jni_header_dir = "$dist_dir/private/jss/_jni";
 
-    $classpath = "-classpath /usr/share/java/slf4j/slf4j-api.jar:/usr/share/java/apache-commons-codec.jar:/usr/share/java/commons-lang.jar:/usr/share/java/ldapjdk.jar:";
+    if( $ENV{BUILD4DEBIAN} ) {
+        $slf4j_jarFile = "/usr/share/java/slf4j-api.jar";
+    } else {
+        $slf4j_jar_File = "/usr/share/java/slf4j-api.jar";
+    }
+    $classpath = "-classpath $slf4j_jarFile:/usr/share/java/commons-codec.jar:/usr/share/java/commons-lang.jar:/usr/share/java/ldapjdk.jar:";
     if( $jce_jar ) {
         $classpath .= ":$jce_jar";
     }
 
+    if( $ENV{CHECK_DEPRECATION} ) {
+        $javac_deprecation_flag = "-Xlint:deprecation";
+    } else {
+        $javac_deprecation_flag = "";
+    }
+
 
     # retrieve present working directory
     $jss_dir = `pwd`;
@@ -338,7 +349,7 @@ MyLabel
     #
     if( scalar(@source_list) > 0 ) {
         ensure_dir_exists($class_dir);
-        print_do("$javac $javac_opt_flag -sourcepath . -d $class_dir " .
+        print_do("$javac $javac_opt_flag $javac_deprecation_flag -sourcepath . -d $class_dir " .
             "$classpath " . join(" ",@source_list));
         print_do("sh -c 'cd $dist_dir/classes && $jar cvmf $dist_dir/MANIFEST.MF $dist_dir/xpclass.jar *'");
         print "Exit status was " . ($?>>8) . "\n";
diff --git a/org/mozilla/jss/tests/all.pl b/org/mozilla/jss/tests/all.pl
index 25c8e023..3de4feb7 100644
--- a/org/mozilla/jss/tests/all.pl
+++ b/org/mozilla/jss/tests/all.pl
@@ -422,7 +422,13 @@ my $result;
 my $command;
 my $serverCommand;
 
-$classpath = "/usr/share/java/slf4j/slf4j-api.jar:/usr/share/java/slf4j/slf4j-jdk14.jar:/usr/share/java/apache-commons-lang.jar:$jss_classpath";
+if( $ENV{BUILD4DEBIAN} ) {
+    $slf4j_jarFiles = "/usr/share/java/slf4j-api.jar:/usr/share/java/slf4j-jdk14.jar";
+} else {
+    $slf4j_jarFiles = "/usr/share/java/slf4j/slf4j-api.jar:/usr/share/java/slf4j/slf4j-jdk14.jar";
+}
+
+$classpath = "$slf4j_jarFiles:/usr/share/java/commons-lang.jar:$jss_classpath";
 
 $testname = "Test UTF-8 Converter";
 $command = "$java -cp $classpath org.mozilla.jss.tests.UTF8ConverterTest";