diff --git a/debian/.gitignore b/debian/.gitignore
index c5b73ce1a4fa1..21b52f4e9d569 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -30,5 +30,6 @@
 /rest-bench-dbg
 /rest-bench
 /python-ceph
-/libceph1-java
+/libcephfs-java
+/libcephfs-jni
 /tmp
diff --git a/debian/control b/debian/control
index 2c44bd45c94d2..dbf95fa944fe9 100644
--- a/debian/control
+++ b/debian/control
@@ -319,8 +319,14 @@ Description: Python libraries for the Ceph distributed filesystem
  This package contains Python libraries for interacting with Ceph's
  RADOS object storage, and RBD (RADOS block device).
 
-Package: libceph1-java
+Package: libcephfs-java
 Section: java
+Architecture: all
+Depends: libcephfs-jni, ${java:Depends}, ${misc:Depends}
+Description: Java libraries for the Ceph File System.
+
+Package: libcephfs-jni
 Architecture: linux-any
+Section: libs
 Depends: libcephfs1, ${shlibs:Depends}, ${java:Depends}, ${misc:Depends}
-Description: Java libraries for the Ceph File System
+Description: Java Native Interface library for CephFS Java bindings.
diff --git a/debian/libcephfs-java.jlibs b/debian/libcephfs-java.jlibs
new file mode 100644
index 0000000000000..f59632afa4604
--- /dev/null
+++ b/debian/libcephfs-java.jlibs
@@ -0,0 +1 @@
+src/java/libcephfs.jar
diff --git a/debian/libceph1-java.install b/debian/libcephfs-jni.install
similarity index 50%
rename from debian/libceph1-java.install
rename to debian/libcephfs-jni.install
index 98133e42ce493..072b9903310d2 100644
--- a/debian/libceph1-java.install
+++ b/debian/libcephfs-jni.install
@@ -1,2 +1 @@
 usr/lib/libcephfs_jni.so* usr/lib/jni
-usr/lib/libcephfs.jar usr/share/java
diff --git a/debian/rules b/debian/rules
index b848ddc8bad61..6d6138559e961 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,6 +93,7 @@ install: build
 # Add here commands to install the package into debian/testpack.
 # Build architecture-independent files here.
 binary-indep: build install
+	jh_installlibs -v -i
 
 # We have nothing to do by default.
 # Build architecture-dependent files here.
diff --git a/src/java/Makefile.am b/src/java/Makefile.am
index 5c54f363f5d2c..5920407ad658d 100644
--- a/src/java/Makefile.am
+++ b/src/java/Makefile.am
@@ -24,7 +24,7 @@ CEPH_PROXY=java/com/ceph/fs/CephMount.class
 
 $(CEPH_PROXY): $(JAVA_SRC)
 	export CLASSPATH=java/ ;
-	$(JAVAC) java/com/ceph/fs/*.java
+	$(JAVAC) -source 1.5 -target 1.5 java/com/ceph/fs/*.java
 
 $(JAVA_H): $(CEPH_PROXY)
 	export CLASSPATH=java/ ; \
diff --git a/src/java/build.xml b/src/java/build.xml
index f846ca433e437..119a187034fd8 100644
--- a/src/java/build.xml
+++ b/src/java/build.xml
@@ -31,7 +31,7 @@
 
 	<target name="compile-tests" depends="makedir">
         <javac srcdir="${test.src.dir}" destdir="${test.build.dir}"
-            includeantruntime="false">
+            includeantruntime="false" source="1.5" target="1.5">
             <classpath>
 				<pathelement location="${env.CEPHFS_JAR}"/>
 				<pathelement location="libcephfs.jar"/>