diff --git a/info.yml b/info.yml
index 728c7ee..6d7157d 100644
--- a/info.yml
+++ b/info.yml
@@ -1,7 +1,7 @@
 name: openjdk-21
 description: OpenJDK Java 21
 version: 21.0.11+10
-revision: 6
+revision: 1
 url: https://openjdk.org/
 license: GPL2-only WITH Classpath-exception-2.0
 maintainers:
diff --git a/recipe.sh b/recipe.sh
index e43f769..09e39b1 100644
--- a/recipe.sh
+++ b/recipe.sh
@@ -41,9 +41,15 @@ package() {
 
   # 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/java.png
+    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
   install -Dm644 "$BPM_SOURCE"/ASSEMBLY_EXCEPTION "$BPM_OUTPUT"/usr/share/licenses/openjdk-${BPM_PKG_VERSION%%.*}/ASSEMBLY_EXCEPTION
 }
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;