diff --git a/info.yml b/info.yml
index f795557..8fdbead 100644
--- a/info.yml
+++ b/info.yml
@@ -1,7 +1,7 @@
 name: openjdk-17
 description: OpenJDK Java 17
-version: 17.0.17+8
-revision: 3
+version: 17.0.19+10
+revision: 1
 url: https://openjdk.org/
 license: GPL2-only WITH Classpath-exception-2.0
 maintainers:
@@ -47,4 +47,4 @@ downloads:
   - url: https://github.com/openjdk/jdk${BPM_PKG_VERSION%%.*}u/archive/jdk-${BPM_PKG_VERSION}.tar.gz
     extract_to: ${BPM_SOURCE}
     extract_strip_components: 1
-    checksum: f62e9d07df29a83b2133f13896e84488196ecd4a53b8ac3c1a87ab11d9d09437
+    checksum: 87dfd1c72a3c9edec212176fd051dec2249bc42202b539b1cb308f0cc7565b74
diff --git a/recipe.sh b/recipe.sh
index 691ab55..09e39b1 100644
--- a/recipe.sh
+++ b/recipe.sh
@@ -11,6 +11,9 @@ build() {
 
   bash configure --enable-unlimited-crypto                       \
                  --disable-warnings-as-errors                    \
+                 --with-extra-cflags="$CFLAGS"                   \
+                 --with-extra-cxxflags="$CXXFLAGS"               \
+                 --with-extra-ldflags="$LDFLAGS"                 \
                  --with-stdc++lib=dynamic                        \
                  --with-giflib=system                            \
                  --with-harfbuzz=system                          \
@@ -34,7 +37,17 @@ package() {
   chown -R root:root "$BPM_OUTPUT"/usr/lib/java/openjdk-${BPM_PKG_VERSION%%.*}
 
   # Symlink cacerts
-  ln -sf /etc/pki/tls/java/cacerts "$BPM_OUTPUT"/usr/lib/java/openjdk-${BPM_PKG_VERSION%%.*}/lib/security/cacerts
+  ln -sf /etc/ssl/certs/java/cacerts "$BPM_OUTPUT"/usr/lib/java/openjdk-${BPM_PKG_VERSION%%.*}/lib/security/cacerts
+
+  # Install icons
+  for size in 16 24 32 48; do
+    install -Dm644 src/java.desktop/unix/classes/sun/awt/X11/java-icon${size}.png "$BPM_OUTPUT"/usr/share/icons/hicolor/${size}x${size}/apps/openjdk-${BPM_PKG_VERSION%%.*}.png
+  done
+
+  # Install desktop files
+  sed "s/%version%/${BPM_PKG_VERSION%%.*}/g" "$BPM_WORKDIR"/openjdk-java.desktop.in | install -Dm644 /dev/stdin "$BPM_OUTPUT"/usr/share/applications/openjdk-${BPM_PKG_VERSION%%.*}-java.desktop
+  sed "s/%version%/${BPM_PKG_VERSION%%.*}/g" "$BPM_WORKDIR"/openjdk-jconsole.desktop.in | install -Dm644 /dev/stdin "$BPM_OUTPUT"/usr/share/applications/openjdk-${BPM_PKG_VERSION%%.*}-jconsole.desktop
+  sed "s/%version%/${BPM_PKG_VERSION%%.*}/g" "$BPM_WORKDIR"/openjdk-jshell.desktop.in | install -Dm644 /dev/stdin "$BPM_OUTPUT"/usr/share/applications/openjdk-${BPM_PKG_VERSION%%.*}-jshell.desktop
 
   # Install package license
   install -Dm644 "$BPM_SOURCE"/LICENSE "$BPM_OUTPUT"/usr/share/licenses/openjdk-${BPM_PKG_VERSION%%.*}/LICENSE
diff --git a/source-files/openjdk-java.desktop.in b/source-files/openjdk-java.desktop.in
new file mode 100644
index 0000000..8eaaf4b
--- /dev/null
+++ b/source-files/openjdk-java.desktop.in
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=OpenJDK Java %version% Runtime
+Name[fi]=OpenJDK Java %version% - ajonaikainen ympäristö
+Comment=OpenJDK Java %version% Runtime
+Comment[fi]=OpenJDK Java %version% - ajonaikainen ympäristö
+Keywords=java;runtime
+Exec=/usr/lib/java/openjdk-%version%/bin/java -jar
+Terminal=false
+Type=Application
+Icon=openjdk-%version%
+MimeType=application/x-java-archive;application/java-archive;application/x-jar;
+NoDisplay=true
diff --git a/source-files/openjdk-jconsole.desktop.in b/source-files/openjdk-jconsole.desktop.in
new file mode 100644
index 0000000..556bd22
--- /dev/null
+++ b/source-files/openjdk-jconsole.desktop.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=OpenJDK Java %version% Console
+Name[fi]=OpenJDK Java %version% - konsoli
+Comment=OpenJDK Java %version% Monitoring & Management Console
+Comment[fi]=OpenJDK Java %version% - valvonta- ja hallintakonsoli
+Keywords=java;console;monitoring
+Exec=/usr/lib/java/openjdk-%version%/bin/jconsole
+Terminal=false
+Type=Application
+Icon=openjdk-%version%
+Categories=Application;System;
diff --git a/source-files/openjdk-jshell.desktop.in b/source-files/openjdk-jshell.desktop.in
new file mode 100644
index 0000000..9bc716e
--- /dev/null
+++ b/source-files/openjdk-jshell.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=OpenJDK Java %version% Shell
+Comment=OpenJDK Java %version% Shell
+Keywords=java;shell
+Exec=/usr/lib/java/openjdk-%version%/bin/jshell
+Terminal=true
+Type=Application
+Icon=openjdk-%version%
+Categories=Application;System;