diff --git a/lib/java/src/com/facebook/thrift/transport/TServerSocket.java b/lib/java/src/com/facebook/thrift/transport/TServerSocket.java
index 14a925b..b4ad6fb 100644
--- a/lib/java/src/com/facebook/thrift/transport/TServerSocket.java
+++ b/lib/java/src/com/facebook/thrift/transport/TServerSocket.java
@@ -64,7 +64,15 @@
    * Creates just a port listening server socket
    */
   public TServerSocket(int port, int clientTimeout) throws TTransportException {
+    this(new InetSocketAddress(port), clientTimeout);
     port_ = port;
+  }
+
+  public TServerSocket(InetSocketAddress bindAddr) throws TTransportException {
+    this(bindAddr, 0);
+  }
+
+  public TServerSocket(InetSocketAddress bindAddr, int clientTimeout) throws TTransportException {
     clientTimeout_ = clientTimeout;
     try {
       // Make server socket
@@ -72,10 +80,10 @@
       // Prevent 2MSL delay problem on server restarts
       serverSocket_.setReuseAddress(true);
       // Bind to listening port
-      serverSocket_.bind(new InetSocketAddress(port_));
+      serverSocket_.bind(bindAddr);
     } catch (IOException ioe) {
       serverSocket_ = null;
-      throw new TTransportException("Could not create ServerSocket on port " + port + ".");
+      throw new TTransportException("Could not create ServerSocket on address " + bindAddr.toString() + ".");
     }
   }