diff --git a/makefile b/makefile
index 64eae5ab4b..20497d054a 100755
--- a/makefile
+++ b/makefile
@@ -1677,7 +1677,7 @@ executable-objects = $(vm-objects) $(classpath-objects) $(driver-object) \
 	$(javahome-object) $(boot-javahome-object) $(lzma-decode-objects)
 
 unittest-executable-objects = $(unittest-objects) $(vm-objects) \
-		$(classpath-objects)
+	$(classpath-objects)
 
 ifeq ($(process),interpret)
 	unittest-executable-objects += $(all-codegen-target-objects)
diff --git a/openjdk.pro b/openjdk.pro
index 71bc20aadd..4ad548281d 100644
--- a/openjdk.pro
+++ b/openjdk.pro
@@ -136,6 +136,7 @@
    public InetSocketAddress(java.net.InetAddress, int);   
  }
 -keep class java.net.ServerSocket
+-keep class java.net.SocketTimeoutException
 
 -keepclassmembers class java.net.PlainSocketImpl {
    <fields>;