diff --git a/SRPMS/sun-java7/sun-java7.spec.in b/SRPMS/sun-java7/sun-java7.spec.in
index 930e2a3..7d7d5ce 100644
--- a/SRPMS/sun-java7/sun-java7.spec.in
+++ b/SRPMS/sun-java7/sun-java7.spec.in
@@ -61,23 +61,25 @@ Sun Java Platform Runtime Environment.
 
 %setup -q -T -c
 
+DOWNLOAD_FRAGMENT=`curl --max-time 20 -sL http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html|grep "Linux x86.*i586.tar.gz"|tail -n1|sed "s|.*/java/jdk/\([a-zA-Z0-9-]*\).*/jdk-.*|\1|"`
+
 #echo yes | MORE=10000
 %ifarch %{ix86}
 wget -nv --tries=2 --no-cookies --header \
    "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
-   http://download.oracle.com/otn-pub/java/jdk/%{pkgver}/jdk-%{realver}-linux-i586.tar.gz
+   http://download.oracle.com/otn-pub/java/jdk/${DOWNLOAD_FRAGMENT}/jdk-%{realver}-linux-i586.tar.gz
 tar xf jdk-%{realver}-linux-i586.tar.gz
 %endif
 %ifarch x86_64
 wget -nv --tries=2 --no-cookies --header \
    "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
-   http://download.oracle.com/otn-pub/java/jdk/%{pkgver}/jdk-%{realver}-linux-x64.tar.gz
+   http://download.oracle.com/otn-pub/java/jdk/${DOWNLOAD_FRAGMENT}/jdk-%{realver}-linux-x64.tar.gz
 tar xf jdk-%{realver}-linux-x64.tar.gz
 %endif
 %ifarch arm
 wget -nv --tries=2 --no-cookies --header \
    "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
-   http://download.oracle.com/otn-pub/java/jdk/%{pkgver}/jdk-%{realver}-linux-arm-vfp-sflt.tar.gz
+   http://download.oracle.com/otn-pub/java/jdk/${DOWNLOAD_FRAGMENT}/jdk-%{realver}-linux-arm-vfp-sflt.tar.gz
 tar xf jdk-%{realver}-linux-arm-sfp.tar.gz
 %endif
 
diff --git a/SRPMS/sun-java8/sun-java8.spec.in b/SRPMS/sun-java8/sun-java8.spec.in
index 1a486f8..186b717 100644
--- a/SRPMS/sun-java8/sun-java8.spec.in
+++ b/SRPMS/sun-java8/sun-java8.spec.in
@@ -61,23 +61,25 @@ Sun Java Platform Runtime Environment.
 
 %setup -q -T -c
 
+DOWNLOAD_FRAGMENT=`curl --max-time 20 -sL http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html|grep "Linux x86.*i586.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*|\1|"`
+
 #echo yes | MORE=10000
 %ifarch %{ix86}
 wget -nv --tries=2 --no-cookies --header \
    "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
-   http://download.oracle.com/otn-pub/java/jdk/%{pkgver}/jdk-%{realver}-linux-i586.tar.gz
+   http://download.oracle.com/otn-pub/java/jdk/${DOWNLOAD_FRAGMENT}/jdk-%{realver}-linux-i586.tar.gz
 tar xf jdk-%{realver}-linux-i586.tar.gz
 %endif
 %ifarch x86_64
 wget -nv --tries=2 --no-cookies --header \
    "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
-   http://download.oracle.com/otn-pub/java/jdk/%{pkgver}/jdk-%{realver}-linux-x64.tar.gz
+   http://download.oracle.com/otn-pub/java/jdk/${DOWNLOAD_FRAGMENT}/jdk-%{realver}-linux-x64.tar.gz
 tar xf jdk-%{realver}-linux-x64.tar.gz
 %endif
 %ifarch arm
 wget -nv --tries=2 --no-cookies --header \
    "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
-   http://download.oracle.com/otn-pub/java/jdk/%{pkgver}/jdk-%{realver}-linux-arm-vfp-sflt.tar.gz
+   http://download.oracle.com/otn-pub/java/jdk/${DOWNLOAD_FRAGMENT}/jdk-%{realver}-linux-arm-vfp-sflt.tar.gz
 tar xf jdk-%{realver}-linux-arm-sfp.tar.gz
 %endif
 
diff --git a/SRPMSVERSIONS b/SRPMSVERSIONS
index 1932b6e..ab68459 100644
--- a/SRPMSVERSIONS
+++ b/SRPMSVERSIONS
@@ -23,12 +23,12 @@ fi
 SRPMRELEASE["spotify"]=1mamba
 # sun-java7
 if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "sun-java7" ]; then
-  SRPMVERSION["sun-java7"]="`curl --max-time 20 -sL http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html|grep "Linux x86.*i586.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*|\1|;s|-|_|" 2>/dev/null`"
+  SRPMVERSION["sun-java7"]="`curl --max-time 20 -sL http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html|grep "Linux x86.*i586.tar.gz"|tail -n1|sed "s|.*/java/jdk/\([a-zA-Z0-9-]*\).*/jdk-.*|\1|;s|-|_|" 2>/dev/null`"
   SRPMRELEASE["sun-java7"]=1mamba
 fi
 # sun-java8
 if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "sun-java8" ]; then
-  SRPMVERSION["sun-java8"]="`curl --max-time 20 -sL http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html|grep "Linux x86.*i586.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*|\1|;s|-|_|" 2>/dev/null`"
+  SRPMVERSION["sun-java8"]="`curl --max-time 20 -sL http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html|grep "Linux x86.*i586.tar.gz"|tail -n1|sed "s|.*/java/jdk/\([a-zA-Z0-9-]*\).*/jdk-.*|\1|;s|-|_|" 2>/dev/null`"
   SRPMRELEASE["sun-java8"]=1mamba
 fi
 # virtualbox-extension-pack
diff --git a/SRPMSVERSIONS.arm b/SRPMSVERSIONS.arm
index 7ac90c6..d4a5169 100644
--- a/SRPMSVERSIONS.arm
+++ b/SRPMSVERSIONS.arm
@@ -1,5 +1,5 @@
 # sun-java7
 if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "sun-java7" ]; then
-SRPMVERSION["sun-java7"]="`curl --max-time 20 -s http://www.oracle.com/technetwork/java/javase/downloads/jdk7-arm-downloads-2187468.html|grep "Linux ARM.*arm-vfp-sflt.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*|\1|;s|-|_|" 2>/dev/null`"
+SRPMVERSION["sun-java7"]="`curl --max-time 20 -s http://www.oracle.com/technetwork/java/javase/downloads/jdk7-arm-downloads-2187468.html|grep "Linux ARM.*arm-vfp-sflt.tar.gz"|tail -n1|sed "s|.*/java/jdk/\([a-zA-Z0-9-]*\).*/jdk-.*|\1|;s|-|_|" 2>/dev/null`"
 SRPMRELEASE["sun-java7"]=1mamba
 fi