Index: java/native/Enquire.cc
===================================================================
--- java/native/Enquire.cc	(revision 7548)
+++ java/native/Enquire.cc	(revision 7550)
@@ -197,7 +197,7 @@
     CATCH(-1)
 }
 
-JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_enquire_1get_1eset__JJJIDLcom_tcdi_app_xapian_ExpandDecider_2 (JNIEnv *env, jclass clazz, jlong eid, jlong maxitems, jlong rsetid, jint flags, jdouble k, jobject ed) {
+JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_enquire_1get_1eset__JJJIDLorg_xapian_ExpandDecider_2 (JNIEnv *env, jclass clazz, jlong eid, jlong maxitems, jlong rsetid, jint flags, jdouble k, jobject ed) {
     TRY
         Enquire *e = _enquire->get(eid);
         RSet *rset = _rset->get(rsetid);
@@ -206,7 +206,7 @@
     CATCH(-1)
 }
 
-JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_enquire_1get_1eset__JJJLcom_tcdi_app_xapian_ExpandDecider_2 (JNIEnv *env, jclass clazz, jlong eid, jlong maxitems, jlong rsetid, jobject ed) {
+JNIEXPORT jlong JNICALL Java_org_xapian_XapianJNI_enquire_1get_1eset__JJJLorg_xapian_ExpandDecider_2 (JNIEnv *env, jclass clazz, jlong eid, jlong maxitems, jlong rsetid, jobject ed) {
     TRY
         Enquire *e = _enquire->get(eid);
         RSet *rset = _rset->get(rsetid);
Index: java/org/xapian/Enquire.java
===================================================================
--- java/org/xapian/Enquire.java	(revision 7548)
+++ java/org/xapian/Enquire.java	(revision 7550)
@@ -111,6 +111,10 @@
         return new ESet(XapianJNI.enquire_get_eset(id, maxitems, rset.id, flags, k, ed));
     }
 
+    public ESet getESet(long maxitems, RSet rset) throws XapianError {
+        return new ESet(XapianJNI.enquire_get_eset(id, maxitems, rset.id, null));
+    }
+
     public ESet getESet(long maxitems, RSet rset, ExpandDecider ed) throws XapianError {
         return new ESet(XapianJNI.enquire_get_eset(id, maxitems, rset.id, ed));
     }
Index: java/org/xapian/RSet.java
===================================================================
--- java/org/xapian/RSet.java	(revision 7548)
+++ java/org/xapian/RSet.java	(revision 7550)
@@ -38,6 +38,10 @@
         this.id = id;
     }
 
+    public RSet() throws XapianError {
+        id = XapianJNI.rset_new();
+    }
+
     public long size() throws XapianError {
         return XapianJNI.rset_size(id);
     }
Index: java/SmokeTest.java
===================================================================
--- java/SmokeTest.java	(revision 7548)
+++ java/SmokeTest.java	(revision 7550)
@@ -95,6 +95,10 @@
 		System.err.println("OP_ELITE_SET is " + Query.OP_ELITE_SET + " not 10");
 		System.exit(1);
 	    }
+
+	    RSet rset = new RSet();
+	    rset.addDocument(1);
+	    ESet eset = enq.getESet(10, rset);
 	} catch (Exception e) {
 	    System.err.println("Caught unexpected exception " + e.toString());
 	    System.exit(1);