--- old/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template	2016-03-06 13:37:17.918639242 +0100
+++ new/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template	2016-03-06 13:37:17.793641395 +0100
@@ -30,7 +30,8 @@
 import java.io.FileDescriptor;
 import jdk.internal.misc.Unsafe;
 import jdk.internal.misc.VM;
-import jdk.internal.ref.Cleaner;
+import java.lang.ref.Cleaner;
+import jdk.internal.ref.CleanerFactory;
 import sun.nio.ch.DirectBuffer;
 
 
@@ -98,13 +99,13 @@
 
     }
 
-    private final Cleaner cleaner;
+    private final Cleaner.Cleanable cleaner;
 
-    public Cleaner cleaner() { return cleaner; }
+    public Cleaner.Cleanable cleaner() { return cleaner; }
 
 #else[byte]
 
-    public Cleaner cleaner() { return null; }
+    public Cleaner.Cleanable cleaner() { return null; }
 
 #end[byte]
 
@@ -136,7 +137,7 @@
         } else {
             address = base;
         }
-        cleaner = Cleaner.create(this, new Deallocator(base, size, cap));
+        cleaner = CleanerFactory.cleaner().register(this, new Deallocator(base, size, cap));
         att = null;
 #else[rw]
         super(cap);
@@ -176,7 +177,9 @@
 #if[rw]
         super(-1, 0, cap, cap, fd);
         address = addr;
-        cleaner = Cleaner.create(this, unmapper);
+        cleaner = (unmapper == null)
+                  ? null
+                  : CleanerFactory.cleaner().register(this, unmapper);
         att = null;
 #else[rw]
         super(cap, addr, fd, unmapper);