diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index c9cb8ea10..456adaccb 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -42,5 +42,6 @@ if(HAVE_X11)
     )
 endif()
 
+configure_file(latte-dock.desktop.cmake latte-dock.desktop)
 install(TARGETS latte-dock ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES latte-dock.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/latte-dock.desktop DESTINATION ${KDE_INSTALL_APPDIR})
diff --git a/app/latte-dock.desktop.cmake b/app/latte-dock.desktop.cmake
new file mode 100644
index 000000000..23a41fc24
--- /dev/null
+++ b/app/latte-dock.desktop.cmake
@@ -0,0 +1,28 @@
+[Desktop Entry]
+Name[de]=Latte
+Name[el]=Latte
+Name[es]=Latte
+Name[it]=Latte
+Name=Latte
+Comment[de]=Dock für die Massen
+Comment[el]=Πίνακας για όλον τον κόσμο
+Comment[es]=Dock para las masas
+Comment[it]=Dock per le masse
+Comment=Dock for the masses
+GenericName[de]=Dock
+GenericName[el]=Πίνακας
+GenericName[es]=Dock
+GenericName[it]=Dock
+GenericName=Dock
+
+Version=@VERSION@
+Categories=Utility;X-SuSE-DesktopUtility;
+Exec=latte-dock %u
+Icon=latte-dock
+InitialPreference=1
+StartupNotify=true
+Terminal=false
+Type=Application
+X-KDE-PluginInfo-Author=@AUTHOR@
+X-KDE-PluginInfo-Email=@EMAIL@
+X-KDE-PluginInfo-Website=@WEBSITE@
diff --git a/po/Messages.sh b/po/Messages.sh
index b0b1bc4f8..61f18eed8 100755
--- a/po/Messages.sh
+++ b/po/Messages.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-BASEDIR="$(pwd $(dirname $0))" # root of translatable sources
-BUGADDR="https://github.com/psifidotos/latte-dock/" # MSGID-Bugs
+cd "$(dirname $0)" # root of translatable sources
+BASEDIR="$(pwd)"
 
-cd "$BASEDIR/.."
+BUGADDR="https://github.com/psifidotos/latte-dock/" # MSGID-Bugs
 
 PROJECTCONTAINMENT="plasma_applet_org.kde.latte.containment" # project name
 TEMPLATECONTCONTAINMENT="containment.metadata.desktop.template" # containment desktop template
@@ -83,5 +83,5 @@ ki18n_xgettext app         "$PROJECTAPP"         "$TEMPLATEAPP"  shell
 # ki18n_xgettext shell       "$PROJECTSHELL"       "$TEMPLATESHELL"
 
 
-cd $BASEDIR
+cd "$BASEDIR"
 bash ./update-metadata.sh
diff --git a/po/desktop-templates/latte-dock.desktop.template b/po/desktop-templates/latte-dock.desktop.template
index c25143a83..722ad30e4 100644
--- a/po/desktop-templates/latte-dock.desktop.template
+++ b/po/desktop-templates/latte-dock.desktop.template
@@ -3,6 +3,7 @@ Name=Latte
 Comment=Dock for the masses
 GenericName=Dock
 
+Version=@VERSION@
 Categories=Utility;X-SuSE-DesktopUtility;
 Exec=latte-dock %u
 Icon=latte-dock
@@ -10,3 +11,6 @@ InitialPreference=1
 StartupNotify=true
 Terminal=false
 Type=Application
+X-KDE-PluginInfo-Author=@AUTHOR@
+X-KDE-PluginInfo-Email=@EMAIL@
+X-KDE-PluginInfo-Website=@WEBSITE@
diff --git a/po/update-metadata.sh b/po/update-metadata.sh
index d99393f42..23850b2b5 100755
--- a/po/update-metadata.sh
+++ b/po/update-metadata.sh
@@ -1,13 +1,14 @@
 #!/bin/sh
 
-BASEDIR="$(pwd $(dirname $0))" # root of translatable sources
+cd "$(dirname $0)" # root of translatable sources
+BASEDIR="$(pwd)"
 
 cd "$BASEDIR/.."
 
 PROJECTCONTAINMENT="$(pwd)/containment/metadata.desktop.cmake" # containment path
 PROJECTPLASMOID="$(pwd)/plasmoid/metadata.desktop.cmake" # plasmoid path
 PROJECTSHELL="$(pwd)/shell/metadata.desktop.cmake" # shell path
-PROJECTAPP="$(pwd)/app/latte-dock.desktop" # app path
+PROJECTAPP="$(pwd)/app/latte-dock.desktop.cmake" # app path
 
 function generate_desktop_file
 {