diff --git a/remotefilelog/fileserverclient.py b/remotefilelog/fileserverclient.py
--- a/remotefilelog/fileserverclient.py
+++ b/remotefilelog/fileserverclient.py
@@ -38,6 +38,11 @@
     # hg 4.5 and earlier
     _sshv1peer = sshpeer.sshv1peer
 
+try:
+    from mercurial.wireprotov1peer import batchable
+except (ImportError, AttributeError):
+    from mercurial.wireproto import batchable
+
 # Statistics for debugging
 fetchcost = 0
 fetches = 0
@@ -57,7 +62,7 @@
 
 def peersetup(ui, peer):
     class remotefilepeer(peer.__class__):
-        @wireproto.batchable
+        @batchable
         def getfile(self, file, node):
             if not self.capable('getfile'):
                 raise error.Abort(
@@ -69,7 +74,7 @@
                 raise error.LookupError(file, node, data)
             yield data
 
-        @wireproto.batchable
+        @batchable
         def getflogheads(self, path):
             if not self.capable('getflogheads'):
                 raise error.Abort('configured remotefile server does not '