diff --git a/src/com/limelight/nvstream/NvControl.java b/src/com/limelight/nvstream/NvControl.java
index 89f66730..4c08ea80 100644
--- a/src/com/limelight/nvstream/NvControl.java
+++ b/src/com/limelight/nvstream/NvControl.java
@@ -15,7 +15,7 @@ public class NvControl implements ConnectionStatusListener {
 	
 	public static final int PORT = 47995;
 	
-	public static final int CONTROL_TIMEOUT = 3000;
+	public static final int CONTROL_TIMEOUT = 5000;
 	
 	public static final short PTYPE_HELLO = 0x1204;
 	public static final short PPAYLEN_HELLO = 0x0004;
diff --git a/src/com/limelight/nvstream/NvHTTP.java b/src/com/limelight/nvstream/NvHTTP.java
index c9fdd62b..65757e32 100644
--- a/src/com/limelight/nvstream/NvHTTP.java
+++ b/src/com/limelight/nvstream/NvHTTP.java
@@ -18,8 +18,7 @@ public class NvHTTP {
 
 	public static final int PORT = 47989;
 	
-	public static final int CONNECTION_TIMEOUT = 3000;
-	public static final int REQUEST_TIMEOUT = 15000;
+	public static final int CONNECTION_TIMEOUT = 5000;
 
 	
 	public String baseUrl;
@@ -63,7 +62,6 @@ public class NvHTTP {
 		URLConnection conn = new URL(url).openConnection();
 		conn.setConnectTimeout(CONNECTION_TIMEOUT);
 		conn.setDefaultUseCaches(false);
-		conn.setReadTimeout(REQUEST_TIMEOUT);
 		conn.connect();
 		return conn.getInputStream();
 	}
diff --git a/src/com/limelight/nvstream/NvHandshake.java b/src/com/limelight/nvstream/NvHandshake.java
index ae7b8d06..db111d16 100644
--- a/src/com/limelight/nvstream/NvHandshake.java
+++ b/src/com/limelight/nvstream/NvHandshake.java
@@ -10,7 +10,7 @@ import java.net.Socket;
 public class NvHandshake {
 	public static final int PORT = 47991;
 	
-	public static final int HANDSHAKE_TIMEOUT = 3000;
+	public static final int HANDSHAKE_TIMEOUT = 5000;
 	
 	public static final byte[] PLATFORM_HELLO =
 		{
diff --git a/src/com/limelight/nvstream/NvVideoStream.java b/src/com/limelight/nvstream/NvVideoStream.java
index 2709f222..136b9f40 100644
--- a/src/com/limelight/nvstream/NvVideoStream.java
+++ b/src/com/limelight/nvstream/NvVideoStream.java
@@ -29,7 +29,7 @@ public class NvVideoStream {
 	public static final int RTCP_PORT = 47999;
 	public static final int FIRST_FRAME_PORT = 47996;
 	
-	public static final int FIRST_FRAME_TIMEOUT = 3000;
+	public static final int FIRST_FRAME_TIMEOUT = 5000;
 	
 	private ArrayBlockingQueue<AvRtpPacket> packets = new ArrayBlockingQueue<AvRtpPacket>(100);