diff --git a/.gitignore b/.gitignore
index 0e7f713..48c4eea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 SOURCES/class-rewriter.tar.gz
-SOURCES/openjdk-icedtea-2.6.4.tar.xz
+SOURCES/openjdk-icedtea-2.6.5.tar.xz
 SOURCES/pulseaudio.tar.gz
 SOURCES/systemtap-tapset-2014-03-19.tar.xz
diff --git a/.java-1.7.0-openjdk.metadata b/.java-1.7.0-openjdk.metadata
index d18c6cd..a83d005 100644
--- a/.java-1.7.0-openjdk.metadata
+++ b/.java-1.7.0-openjdk.metadata
@@ -1,4 +1,4 @@
 fcc167de17354efb6e52cb387eb3e7dbb0316b53 SOURCES/class-rewriter.tar.gz
-874db7bfc0de8c75cd8eed6da43f818c0080ae45 SOURCES/openjdk-icedtea-2.6.4.tar.xz
+28cbb27d7d6fe350cd1a2243b2f3cbafcecdb223 SOURCES/openjdk-icedtea-2.6.5.tar.xz
 fb72b6b1f4735ad9b5799d0b5058b0b1dec67b17 SOURCES/pulseaudio.tar.gz
 becc037bf0eb13b5f0ebcdd94b58ebfe6336b7a0 SOURCES/systemtap-tapset-2014-03-19.tar.xz
diff --git a/SPECS/java-1.7.0-openjdk.spec b/SPECS/java-1.7.0-openjdk.spec
index ca5a928..18c7a32 100644
--- a/SPECS/java-1.7.0-openjdk.spec
+++ b/SPECS/java-1.7.0-openjdk.spec
@@ -5,7 +5,7 @@
 # conflicting) files in the -debuginfo package
 %undefine _missing_build_ids_terminate_build
 
-%global icedtea_version 2.6.4
+%global icedtea_version 2.6.5
 %global hg_tag icedtea-{icedtea_version}
 
 %global aarch64			aarch64 arm64 armv8
@@ -126,7 +126,7 @@
 
 # Standard JPackage naming and versioning defines.
 %global origin          openjdk
-%global updatever       95
+%global updatever       99
 %global buildver        00
 # Keep priority on 7digits in case updatever>9
 %global priority        17000%{updatever}
@@ -1542,6 +1542,11 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
+* Thu Mar 24 2016 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.7.0.99-2.6.5.0
+- Bump to 2.6.5 and u99b00.
+- Correct check for fsg.sh in tarball creation script
+- Resolves: rhbz#1320658
+
 * Tue Jan 19 2016 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.7.0.95-2.6.4.0
 - Bump to 2.6.4 and u95b00.
 - Backport tarball creation script from OpenJDK 8 RPMs and update fsg.sh to work with it.