diff --git a/.gitignore b/.gitignore
index b93d099..7b825f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /jdk8-jdk8-b132.tar.xz
 /aarch64-port-rc4.tar.xz
 /aarch64-port-jdk8-b128-aarch64-992.tar.xz
+/jdk8u-jdk8u5-b13.tar.xz
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 0811a86..4673921 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -2,21 +2,29 @@
 
 # Generates the 'source tarball' for JDK 8 projects.
 #
-# Usage: generate_source_tarball.sh repo_name tag
+# Usage: generate_source_tarball.sh project_name repo_name tag
 #
 # Examples:
-#   ./generate_source_tarball.sh jdk8 jdk8-b79
-#   ./generate_source_tarball.sh aarch64-port aarch64-${DATE}
+#   ./generate_source_tarball.sh jdk8 jdk8 jdk8-b79
+#   ./generate_source_tarball.sh jdk8u jdk8u jdk8u5-b13
+#   ./generate_source_tarball.sh aarch64-port jdk8 aarch64-${DATE}
 #
 # This script creates a single source tarball out of the repository
-# based on the given tag and removes code not allowed in fedora.
+# based on the given tag and removes code not allowed in fedora. For
+# consistency, the source tarball will always contain 'jdk8' as the top
+# level folder.
 
 set -e
 
-REPO_NAME="$1"
-VERSION="$2"
-JDK8_URL=http://hg.openjdk.java.net
+PROJECT_NAME="$1"
+REPO_NAME="$2"
+VERSION="$3"
+OPENJDK_URL=http://hg.openjdk.java.net
 
+if [[ "${PROJECT_NAME}" = "" ]] ; then
+    echo "No repository specified."
+    exit -1
+fi
 if [[ "${REPO_NAME}" = "" ]] ; then
     echo "No repository specified."
     exit -1
@@ -29,13 +37,13 @@ fi
 mkdir "${REPO_NAME}"
 pushd "${REPO_NAME}"
 
-REPO_ROOT="${JDK8_URL}/${REPO_NAME}/jdk8"
+REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}"
 
 wget "${REPO_ROOT}/archive/${VERSION}.tar.gz"
 tar xf "${VERSION}.tar.gz"
 rm  "${VERSION}.tar.gz"
 
-mv "jdk8-${VERSION}" jdk8
+mv "${REPO_NAME}-${VERSION}" jdk8
 pushd jdk8
 
 for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index e2ded41..5d60bc0 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -1,8 +1,6 @@
 # If debug is 1, OpenJDK is built with all debug info present.
 %global debug 0
 
-%global jdk8_version b132
-%global hg_tag jdk8-%{jdk8_version}
 %global aarch64_hg_tag  992
 
 %global aarch64         aarch64 arm64 armv8
@@ -84,8 +82,8 @@
 
 # Standard JPackage naming and versioning defines.
 %global origin          openjdk
-%global updatever       0
-%global buildver        %{jdk8_version}
+%global updatever       5
+%global buildver        b13
 %global aarch64_updatever 0
 %global aarch64_buildver b128
 # priority must be 6 digits in total
@@ -130,7 +128,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: 2.%{buildver}%{?dist}
+Release: 1.%{buildver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -148,9 +146,9 @@ License:  ASL 1.1 and ASL 2.0 and GPL+ and GPLv2 and GPLv2 with exceptions and L
 URL:      http://openjdk.java.net/
 
 # Source from upstrem OpenJDK8 project. To regenerate, use
-# ./generate_source_tarball.sh jdk8 %{hg_tag}
-# ./generate_source_tarball.sh aarch64-port %{aarch64_hg_tag}
-Source0:  jdk8-%{hg_tag}.tar.xz
+# ./generate_source_tarball.sh jdk8u jdk8u jdk8u%{updatever}-%{buildver}
+# ./generate_source_tarball.sh aarch64-port jdk8 %{aarch64_hg_tag}
+Source0:  jdk8u-jdk8u%{updatever}-%{buildver}.tar.xz
 Source1:  aarch64-port-jdk8-%{aarch64_buildver}-aarch64-%{aarch64_hg_tag}.tar.xz
 
 # Custom README for -src subpackage
@@ -1097,6 +1095,9 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
+* Tue Apr 15 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.5-1.b13
+- Update to the latest security release: OpenJDK8 u5 b13
+
 * Fri Mar 28 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-2.b132
 - Include version information in desktop files
 - Move desktop files from tarball to top level source
diff --git a/sources b/sources
index 6b19003..ebf2fe3 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-84ef926a9a445a79ce6c5dd4d4d5143f  jdk8-jdk8-b132.tar.xz
+05eaf803e52ffeba351f3701556e5132  jdk8u-jdk8u5-b13.tar.xz
 94ca5a45c3cb3b85c4577d0891166007  systemtap-tapset.tar.gz
 944bc1bc5b3a23ab7748bcf3230f5afc  aarch64-port-jdk8-b128-aarch64-992.tar.xz