diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 4888f74..5c33e7d 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -1211,6 +1211,8 @@ Patch582: pr3619.patch
 # PR3620: Shenandoah broken on ppc64
 Patch583: pr3620.patch
 
+#############################################
+#
 # Non-OpenJDK fixes
 #
 #############################################
@@ -2269,6 +2271,14 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Mon Aug 27 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:1.8.0.181.b13-9
+- Adjust system jpeg patch, system-libjpeg.patch, so as to filter
+  -Wl,--as-needed. Resolves RHBZ#1622186.
+
+* Mon Aug 27 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:1.8.0.181.b13-8
+- Adjust system NSS patch, pr1983-jdk.patch, so as to filter
+  -Wl,--as-needed. Resolves RHBZ#1622186.
+
 * Thu Aug 23 2018 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.181.b15-0
 - Move to single OpenJDK tarball build, based on aarch64/shenandoah-jdk8u.
 - Update to aarch64-shenandoah-jdk8u181-b15.
diff --git a/pr1983-jdk.patch b/pr1983-jdk.patch
index 673b8a9..31c285b 100644
--- a/pr1983-jdk.patch
+++ b/pr1983-jdk.patch
@@ -41,8 +41,13 @@ diff -r 984a4af2ed4e make/lib/SecurityLibraries.gmk
        LANG := C++, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \
-@@ -248,8 +257,8 @@
-       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
+@@ -245,11 +254,12 @@
+       CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \
+           $(BUILD_LIBSUNEC_FLAGS), \
+       MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsunec/mapfile-vers, \
+-      LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
++      LDFLAGS := $(subst -Xlinker --as-needed,, \
++        $(subst -Wl$(COMMA)--as-needed,, $(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK), \
        LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
        LDFLAGS_SUFFIX := $(LIBCXX), \
 -      LDFLAGS_SUFFIX_linux := -lc, \
diff --git a/system-libjpeg.patch b/system-libjpeg.patch
index fa01115..003f32b 100644
--- a/system-libjpeg.patch
+++ b/system-libjpeg.patch
@@ -51,7 +51,7 @@ diff -ruN jdk8/common/autoconf/libraries.m4 jdk8/common/autoconf/libraries.m4
 diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.gmk
 --- jdk8/jdk/make/lib/Awt2dLibraries.gmk	2013-10-31 19:44:18.000000000 -0400
 +++ jdk8/jdk/make/lib/Awt2dLibraries.gmk	2013-11-14 21:56:01.020796703 -0500
-@@ -696,17 +696,17 @@
+@@ -693,17 +693,17 @@
  ##########################################################################################
  
  ifdef OPENJDK
@@ -75,7 +75,7 @@ diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.
    endif
  endif
  
-@@ -721,37 +721,37 @@
+@@ -718,37 +718,38 @@
  #      $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \
  #          \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) )
  #  ifeq ($(CC_43_OR_NEWER), 1)
@@ -101,7 +101,8 @@ diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.
 -    MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \
 -    LDFLAGS := $(LDFLAGS_JDKLIB) \
 +    MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
-+    LDFLAGS := $(LDFLAGS_JDKLIB) -ljpeg \
++    LDFLAGS := $(subst -Xlinker --as-needed,, \
++        $(subst -Wl$(COMMA)--as-needed,, $(LDFLAGS_JDKLIB))) -ljpeg \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \
      LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
@@ -126,7 +127,7 @@ diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.
  
  ##########################################################################################
  
-@@ -1183,7 +1183,6 @@
+@@ -1127,7 +1128,6 @@
  
  ifndef BUILD_HEADLESS_ONLY
    LIBSPLASHSCREEN_DIRS := \
@@ -134,7 +135,7 @@ diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.
      $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
      $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
  
-@@ -1194,6 +1193,13 @@
+@@ -1138,6 +1138,13 @@
      GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
    endif
  
@@ -148,7 +149,7 @@ diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.
    ifneq ($(OPENJDK_TARGET_OS), macosx)
      LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
    else
-@@ -1256,11 +1262,13 @@
+@@ -1193,11 +1200,13 @@
        EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
        LANG := C, \
        OPTIMIZATION := LOW, \