diff --git a/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/.calculate_directory b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/.calculate_directory
new file mode 100644
index 000000000..0c53af713
--- /dev/null
+++ b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip merge(media-sound/clementine)!=
diff --git a/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/install/.calculate_directory b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/install/.calculate_directory
new file mode 100644
index 000000000..3d9acac63
--- /dev/null
+++ b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/install/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip pkg(media-sound/clementine)!=&&ini(desktop.audioplayer)==||pkg(media-sound/clementine)!=&&ini(desktop.audioplayer)==clementine
diff --git a/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/install/amarok-2.5.desktop b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/install/amarok-2.5.desktop
new file mode 100644
index 000000000..46400e201
--- /dev/null
+++ b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/install/amarok-2.5.desktop
@@ -0,0 +1,6 @@
+# Calculate format=kde link=/usr/share/applications/clementine.desktop name=calculate-audioplayer.desktop mirror pkg(media-sound/clementine)>=1.0
+
+# Hide icon
+[Desktop Entry]
+NoDisplay=true
+!MimeType=
diff --git a/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/install/mimeapps.list b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/install/mimeapps.list
new file mode 100644
index 000000000..4fc487eb0
--- /dev/null
+++ b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/install/mimeapps.list
@@ -0,0 +1,12 @@
+# Calculate format=compiz protected
+
+# Update info
+#-ini(desktop.updating, on)-#
+#-ini(desktop.audioplayer, clementine)-#
+
+[Added Associations]
+audio/mp4=clementine.desktop;
+audio/mpeg=clementine.desktop;
+audio/x-flac=clementine.desktop;
+audio/x-ms-wma=clementine.desktop;
+audio/x-wav=clementine.desktop;
diff --git a/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/uninstall b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/uninstall
new file mode 100644
index 000000000..ed9f3c7dd
--- /dev/null
+++ b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/uninstall
@@ -0,0 +1,5 @@
+# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(media-sound/clementine)==&&ini(desktop.audioplayer)==clementine
+
+[desktop]
+!audioplayer=
+audioplayer-removing=on
diff --git a/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/mimeapps.list b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/mimeapps.list
index e5db94f6c..8ff5af1b0 100644
--- a/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/mimeapps.list
+++ b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/mimeapps.list
@@ -1,4 +1,4 @@
-# Calculate format=compiz protected ini(desktop.audioplayer-removing)==on merge=media-sound/amarok,media-sound/rhythmbox,media-sound/audacious
+# Calculate format=compiz protected ini(desktop.audioplayer-removing)==on merge=media-sound/amarok,media-sound/rhythmbox,media-sound/audacious,media-sound/clementine
 
 #-ini(desktop.audioplayer-removing,)-#