diff --git a/Makefile b/Makefile
index d691840..8d6868e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,12 +12,11 @@ pck_srpms = b43-firmware
 else
 ifeq ($(ARCH), x86_64)
 SRPMSVERSIONSFILE = SRPMSVERSIONS
-pck_srpms = flashplugin msttcorefonts win32codecs skype b43-firmware virtualbox-extension-pack \
-            sun-java spotify chromium-pepper-flash chromium-widevine
+pck_srpms = msttcorefonts skype b43-firmware virtualbox-extension-pack \
+            chromium-widevine
 else
 SRPMSVERSIONSFILE = SRPMSVERSIONS
-pck_srpms = flashplugin msttcorefonts win32codecs skype b43-firmware virtualbox-extension-pack \
-            sun-java spotify chromium-pepper-flash
+pck_srpms = msttcorefonts skype b43-firmware virtualbox-extension-pack
 endif
 endif
 PACKAGE = desktop-base-openmamba
diff --git a/SRPMSVERSIONS b/SRPMSVERSIONS
index 6ad7d4f..f2c5ce6 100644
--- a/SRPMSVERSIONS
+++ b/SRPMSVERSIONS
@@ -23,7 +23,7 @@ fi
 SRPMRELEASE["spotify"]=1mamba
 # sun-java
 if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "sun-java8" -o "$SRPMCHECK" = "sun-java" ]; then
-  SRPMVERSION["sun-java"]="`curl --max-time 20 -sL https://www.oracle.com/technetwork/java/javase/downloads/jdk12-downloads-5295953.html|grep "linux-x64_bin.tar.gz"|tail -n1|sed "s|.*/java/jdk/\([.a-zA-Z0-9-]*\).*/jdk-.*|\1|;s|-|_|" 2>/dev/null`"
+  SRPMVERSION["sun-java"]="`curl --max-time 20 -sL https://www.oracle.com/technetwork/java/javase/downloads/jdk12-downloads-5295953.html|grep "linux-x64_bin.tar.gz"|tail -n1|sed "s|.*jdk-\([.0-9-]*\).*|\1|;s|-|_|" 2>/dev/null`"
   SRPMRELEASE["sun-java"]=1mamba
 fi
 # virtualbox-extension-pack