diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index 79bc715..ccddf89 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -167,8 +167,8 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   AX_SUBST(BUILD_NUMBER)
   BUILD_DATE=$(LANG= date +"%a, %d %b %Y %H:%M:%S %z")
   AX_SUBST(BUILD_DATE)
-  if test -f "${PACKAGE_NAME}.dektop.in"; then
-     PACKAGE_DESKTOP="${PACKAGE_NAME}.dektop"
+  if test -f "${PACKAGE_NAME}.desktop.in"; then
+     PACKAGE_DESKTOP="${PACKAGE_NAME}.desktop"
   fi
   AX_SUBST(PACKAGE_DESKTOP)
   if test -f "${PACKAGE_NAME}-logo.png"; then
diff --git a/bootstrap.sh b/bootstrap.sh
index 018166e..67b7bf0 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -118,6 +118,7 @@ GENERATED FILES
     * README - add project description (first line is header, followed by an empty line)
     * configure.ac - global configuration file template
     * makefile.am - global makefile template
+    * ${DEFAULT_PROJECT_NAME}.desktop.in - linux desktop file
     * src/makefile.am - if you enabled AX_USE_CXX
     * src/version.hxx - if you enabled AX_USE_CXX
     * src/version.cxx - if you enabled AX_USE_CXX
@@ -322,7 +323,7 @@ checkdir() {
 
 checkfile() {
     exists=0
-    if test -f "$1"; then
+    if test -f "$1" -o -f "$1".in; then
         exists=1
     fi
     test $exists -eq 1
@@ -1042,10 +1043,10 @@ done
 to makefile.am<<EOF
 ${HEADER}SUBDIRS =${SUBDIRS}
 
-desktopdir = ${datadir}/applications
+desktopdir = \${datadir}/applications
 desktop_DATA = @PACKAGE_DESKTOP@
-pkgdata_DATA = @PACKAGE_ICON@
-doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
+dist_pkgdata_DATA = @PACKAGE_ICON@
+dist_doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
 
 MAINTAINERCLEANFILES = makefile.in
 EOF
diff --git a/makefile.am b/makefile.am
index af2429f..ea9e643 100644
--- a/makefile.am
+++ b/makefile.am
@@ -2,7 +2,7 @@
 ##
 ## This file has been added:
 ##  - by bootstrap.sh
-##  -  on Wed, 11 November 2015 16:21:05 +0100
+##  -  on Fri, 13 November 2015 16:51:30 +0100
 ## Feel free to change it or even remove and rebuild it, up to your needs
 ##
 ##       1         2         3         4         5         6         7         8
@@ -10,9 +10,9 @@
 
 SUBDIRS = src doc
 
-desktopdir = /applications
+desktopdir = ${datadir}/applications
 desktop_DATA = @PACKAGE_DESKTOP@
-pkgdata_DATA = @PACKAGE_ICON@
-doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
+dist_pkgdata_DATA = @PACKAGE_ICON@
+dist_doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
 
 MAINTAINERCLEANFILES = makefile.in
diff --git a/src/tokentool.ui b/src/tokentool.ui
index 52ab3e0..dbf9326 100644
--- a/src/tokentool.ui
+++ b/src/tokentool.ui
@@ -22,7 +22,7 @@
     <item row="0" column="0">
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
-       <number>1</number>
+       <number>0</number>
       </property>
       <widget class="QWidget" name="widget">
        <attribute name="title">