diff --git a/build_java.pl b/build_java.pl
index de45dbd2..574d70a6 100644
--- a/build_java.pl
+++ b/build_java.pl
@@ -160,11 +160,24 @@ 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} ) {
+        $slf4jextra = "";
+        $common_codec_name = "commons-codec";
+    } else {
+        $slf4jextra = "slf4j";
+        $common_codec_name = "apache-commons-codec";
+    }
+    $classpath = "-classpath /usr/share/java/$slf4jextra/slf4j-api.jar:/usr/share/java/$common_codec_name.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
     $pwd = `pwd`;
@@ -334,7 +347,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";