diff --git a/.gitignore b/.gitignore
index 81e1a70..fc1fd5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/icedtea6-1.13.1.tar.gz
+SOURCES/icedtea6-1.13.3.tar.gz
 SOURCES/java-access-bridge-1.23.0.tar.bz2
-SOURCES/openjdk-6-src-b30-21_jan_2014-rhel.tar.gz
+SOURCES/openjdk-6-src-b31-15_apr_2014-rhel.tar.gz
diff --git a/.java-1.6.0-openjdk.metadata b/.java-1.6.0-openjdk.metadata
index 602eec5..5623611 100644
--- a/.java-1.6.0-openjdk.metadata
+++ b/.java-1.6.0-openjdk.metadata
@@ -1,3 +1,3 @@
-34cb7eedf62f013a184dc05624c2d3189f3b6847 SOURCES/icedtea6-1.13.1.tar.gz
+5bd9308bd65145a71a8f905006edc64910b7cf21 SOURCES/icedtea6-1.13.3.tar.gz
 aa2c61cc73bad1e1a09e8843f341270f70921dbf SOURCES/java-access-bridge-1.23.0.tar.bz2
-4eb1a4d85be8b7fc4d1e398d2718249b1000fa2a SOURCES/openjdk-6-src-b30-21_jan_2014-rhel.tar.gz
+5f74e3cd4efe2725e296b7bfdc44f5f245ba896c SOURCES/openjdk-6-src-b31-15_apr_2014-rhel.tar.gz
diff --git a/SOURCES/1.13_fixes.patch b/SOURCES/1.13_fixes.patch
deleted file mode 100644
index 9ef5d6a..0000000
--- a/SOURCES/1.13_fixes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- patches/alternative_krb5_cache_fixup.patch
-+++ patches/alternative_krb5_cache_fixup.patch
-@@ -1,10 +1,11 @@
- diff -Nru openjdk.orig/jdk/make/jdk_generic_profile.sh openjdk/jdk/make/jdk_generic_profile.sh
- --- openjdk.orig/jdk/make/jdk_generic_profile.sh	2013-08-30 02:41:17.276807687 +0100
- +++ openjdk/jdk/make/jdk_generic_profile.sh	2013-08-30 12:11:12.428923185 +0100
--@@ -467,5 +467,14 @@
-- export LCMS_CFLAGS
-- export LCMS_LIBS
-- 
-+@@ -446,3 +447,12 @@
-+     export LLVM_LIBS
-+   fi
-+ fi
-++
- +# Export variables for system krb5
- +# KRB5_CFLAGS and KRB5_LIBS tell the compiler how to compile and
- +# link against Kerberos
-@@ -12,9 +13,6 @@
- +    KRB5_LIBS="-lkrb5"
- +fi
- +export KRB5_LIBS
--+
-- # IcedTea defaults; use system libraries
-- export SYSTEM_LCMS=true
- +export SYSTEM_KRB5=true
- diff -Nru openjdk.orig/jdk/make/sun/security/krb5/internal/ccache/Makefile openjdk/jdk/make/sun/security/krb5/internal/ccache/Makefile
- --- openjdk.orig/jdk/make/sun/security/krb5/internal/ccache/Makefile	2013-08-30 02:41:17.408809749 +0100
-
diff --git a/SOURCES/1051245.patch b/SOURCES/1051245.patch
deleted file mode 100644
index 93e343c..0000000
--- a/SOURCES/1051245.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-
-# HG changeset patch
-# User aph
-# Date 1393436292 0
-# Node ID d79945b90be5f732af88f678c615b6bc5c18058b
-# Parent  b49e33de40eafc113d3ca822f4abe2fde31d2cc2
-OPENJDK6-1: ensure JDK_GetVersionInfo0 memsets the whole info struct not just 8 bytes
-Reviewed-by: adinn
-
-diff -r b49e33de40ea -r d79945b90be5 src/share/native/common/jdk_util.c
---- openjdk/jdk/src/share/native/common/jdk_util.c	Mon Jan 23 12:39:41 2012 -0800
-+++ openjdk/jdk/src/share/native/common/jdk_util.c	Wed Feb 26 17:38:12 2014 +0000
-@@ -76,7 +76,7 @@
-     }
- 
- 
--    memset(info, 0, sizeof(info_size));
-+    memset(info, 0, info_size);
-     info->jdk_version = ((jdk_major_version & 0xFF) << 24) |
-                         ((jdk_minor_version & 0xFF) << 16) |
-                         ((jdk_micro_version & 0xFF) << 8)  |
-
diff --git a/SPECS/java-1.6.0-openjdk.spec b/SPECS/java-1.6.0-openjdk.spec
index 579e0de..4684d7b 100644
--- a/SPECS/java-1.6.0-openjdk.spec
+++ b/SPECS/java-1.6.0-openjdk.spec
@@ -7,10 +7,10 @@
 %define debug 0
 
 
-%define icedteaver 1.13.1
+%define icedteaver 1.13.3
 %define icedteasnapshot %{nil}
-%define openjdkver b30
-%define openjdkdate 21_jan_2014
+%define openjdkver b31
+%define openjdkdate 15_apr_2014
 
 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
 
@@ -195,9 +195,7 @@ Patch3:	  java-1.6.0-openjdk-java-access-bridge-security.patch
 Patch4:   java-1.6.0-openjdk-accessible-toolkit.patch
 Patch5:   java-1.6.0-openjdk-debugdocs.patch
 Patch6:   %{name}-debuginfo.patch
-Patch7:   1.13_fixes.patch
 Patch104: type_hsx23_patch4.patch
-Patch9:   1051245.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -351,7 +349,6 @@ The OpenJDK API documentation.
 %setup -q -n icedtea6-%{icedteaver}
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2
 %patch0
-%patch7
 
 cp %{SOURCE4} .
 
@@ -376,8 +373,6 @@ export CFLAGS="$CFLAGS -mieee"
 
 make patch
 
-patch -l -p0 < %{PATCH9}
-
 patch -l -p0 < %{PATCH3}
 patch -l -p0 < %{PATCH4}
 
@@ -875,6 +870,13 @@ exit 0
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue May 20 2014 Jiri Vanek <jvanek@redhat.com> - 1:1.6.0.1-6.1.13.3
+- updated to icedtea 1.13.3
+- updated to openjdk-6-src-b31-15_apr_2014
+- renmoved upstreamed patch7, 1.13_fixes.patch
+- renmoved upstreamed patch9, 1051245.patch
+- Resolves: rhbz#1099563
+
 * Thu Mar 13 2014 Jiri Vanek <jvanek@redhat.com> - 1:1.6.0.1-7.1.13.1
 - added and applied patch9 1051245.patch
 - Resolves: rhbz#1070816