diff --git a/makefile b/makefile
index a7e4389511..2578ac6107 100755
--- a/makefile
+++ b/makefile
@@ -120,16 +120,24 @@ ifneq ($(openjdk),)
 		openjdk-jar-dep = $(build)/openjdk-jar.dep
 		classpath-jar-dep = $(openjdk-jar-dep)
 		javahome = $(embed-prefix)/javahomeJar
-		javahome-files = lib/zi lib/currency.data lib/security/java.security \
+		javahome-files = lib/currency.data lib/security/java.security \
 			lib/security/java.policy lib/security/cacerts
 
+		ifneq (,$(wildcard $(openjdk)/jre/lib/zi))
+			javahome-files += lib/zi
+		endif
+
+		ifneq (,$(wildcard $(openjdk)/jre/lib/tzdb.dat))
+			javahome-files += lib/tzdb.dat
+		endif
+
 		local-policy = lib/security/local_policy.jar
-		ifeq ($(shell test -e "$(openjdk)/jre/$(local-policy)" && echo found),found)
+		ifneq (,$(wildcard $(openjdk)/jre/$(local-policy)))
 			javahome-files += $(local-policy)
 		endif
 
 		export-policy = lib/security/US_export_policy.jar
-		ifeq ($(shell test -e "$(openjdk)/jre/$(export-policy)" && echo found),found)
+		ifneq (,$(wildcard $(openjdk)/jre/$(export-policy)))
 			javahome-files += $(export-policy)
 		endif
 
diff --git a/openjdk-src.mk b/openjdk-src.mk
index 0f59e03bcb..ea4acd9c03 100644
--- a/openjdk-src.mk
+++ b/openjdk-src.mk
@@ -19,10 +19,10 @@ openjdk-sources = \
 	$(openjdk-src)/share/native/java/lang/Float.c \
 	$(openjdk-src)/share/native/java/lang/Object.c \
 	$(openjdk-src)/share/native/java/lang/Package.c \
-	$(openjdk-src)/share/native/java/lang/ref/Finalizer.c \
+	$(wildcard $(openjdk-src)/share/native/java/lang/ref/Finalizer.c) \
 	$(openjdk-src)/share/native/java/lang/reflect/Array.c \
 	$(openjdk-src)/share/native/java/lang/reflect/Proxy.c \
-	$(openjdk-src)/share/native/java/lang/ResourceBundle.c \
+	$(wildcard $(openjdk-src)/share/native/java/lang/ResourceBundle.c) \
 	$(openjdk-src)/share/native/java/lang/Runtime.c \
 	$(openjdk-src)/share/native/java/lang/SecurityManager.c \
 	$(openjdk-src)/share/native/java/lang/Shutdown.c \
@@ -38,7 +38,7 @@ openjdk-sources = \
 	$(openjdk-src)/share/native/java/net/Inet6Address.c \
 	$(openjdk-src)/share/native/java/nio/Bits.c \
 	$(openjdk-src)/share/native/java/security/AccessController.c \
-	$(openjdk-src)/share/native/java/sql/DriverManager.c \
+	$(wildcard $(openjdk-src)/share/native/java/sql/DriverManager.c) \
 	$(openjdk-src)/share/native/java/util/concurrent/atomic/AtomicLong.c \
 	$(openjdk-src)/share/native/java/util/TimeZone.c \
 	$(openjdk-src)/share/native/java/util/zip/Adler32.c \
@@ -250,11 +250,12 @@ else
 		$(openjdk-src)/solaris/native/java/io/FileDescriptor_md.c \
 		$(openjdk-src)/solaris/native/java/io/FileInputStream_md.c \
 		$(openjdk-src)/solaris/native/java/io/FileOutputStream_md.c \
-		$(openjdk-src)/solaris/native/java/io/FileSystem_md.c \
+		$(wildcard $(openjdk-src)/solaris/native/java/io/FileSystem_md.c) \
 		$(openjdk-src)/solaris/native/java/io/io_util_md.c \
 		$(openjdk-src)/solaris/native/java/io/RandomAccessFile_md.c \
 		$(openjdk-src)/solaris/native/java/io/UnixFileSystem_md.c \
 		$(openjdk-src)/solaris/native/java/lang/java_props_md.c \
+		$(wildcard $(openjdk-src)/solaris/native/java/lang/childproc.c) \
 		$(openjdk-src)/solaris/native/java/lang/ProcessEnvironment_md.c \
 		$(openjdk-src)/solaris/native/java/lang/UNIXProcess_md.c \
 		$(openjdk-src)/solaris/native/java/net/net_util_md.c \