--- a/common/autoconf/jdk-options.m4	Sun Aug 10 19:38:50 2014 -0700
+++ b/common/autoconf/jdk-options.m4	Sun Aug 17 15:51:37 2014 +0100
@@ -414,8 +414,6 @@
       [specify alternative cacerts file])])
   if test "x$with_cacerts_file" != x; then
     CACERTS_FILE=$with_cacerts_file
-  else
-    CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
   fi
   AC_SUBST(CACERTS_FILE)
 
@@ -441,7 +439,7 @@
   [
     AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
 
-    if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
+    if test -d "${SRC_ROOT}/jdk/src/jdk.crypto.ec/share/native/libsunec/impl"; then
       ENABLE_INTREE_EC=yes
       AC_MSG_RESULT([yes])
     else