diff --git a/src/main/java/net/schmizz/sshj/connection/channel/AbstractChannel.java b/src/main/java/net/schmizz/sshj/connection/channel/AbstractChannel.java
index f465f0a7..f2461312 100644
--- a/src/main/java/net/schmizz/sshj/connection/channel/AbstractChannel.java
+++ b/src/main/java/net/schmizz/sshj/connection/channel/AbstractChannel.java
@@ -254,7 +254,7 @@ public abstract class AbstractChannel
         closeEvent.await();
     }
 
-    public void join(int timeout, TimeUnit unit)
+    public void join(long timeout, TimeUnit unit)
             throws ConnectionException {
         closeEvent.await(timeout, unit);
     }
diff --git a/src/main/java/net/schmizz/sshj/connection/channel/Channel.java b/src/main/java/net/schmizz/sshj/connection/channel/Channel.java
index b240765c..12daadc7 100644
--- a/src/main/java/net/schmizz/sshj/connection/channel/Channel.java
+++ b/src/main/java/net/schmizz/sshj/connection/channel/Channel.java
@@ -131,7 +131,7 @@ public interface Channel
     void join()
             throws ConnectionException;
 
-    void join(int timeout, TimeUnit unit)
+    void join(long timeout, TimeUnit unit)
             throws ConnectionException;
 
 }