diff --git a/other/qtmindmap-0.2.ebuild b/other/qtmindmap-0.2.ebuild
index 75ef70f..cc55d2d 100644
--- a/other/qtmindmap-0.2.ebuild
+++ b/other/qtmindmap-0.2.ebuild
@@ -1,10 +1,10 @@
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 
 EAPI="3"
 inherit qt4-r2
-LANGS="hu nb"
-IUSE="linguas_hu linguas_nb"
+# LANGS="hu nb"
+# IUSE="linguas_hu linguas_nb"
 
 DESCRIPTION="MindMap software written in Qt"
 HOMEPAGE="https://gitorious.org/qtmindmap"
@@ -21,28 +21,9 @@ DEPEND=">=x11-libs/qt-core-4.6
 RDEPEND="${DEPEND}"
 src_configure() {
   eqmake4 "${S}"/qtmindmap-qtmindmap/qtmindmap.pro
-
-  if use "linguas_hu"; then
-    lrelease "${S}"/qtmindmap-qtmindmap/lang/qtmindmap_hu.ts
-  fi
-
-  if use "linguas_nb"; then
-    lrelease "${S}"/qtmindmap-qtmindmap/lang/qtmindmap_nb_NO.ts
-  fi
 }
 
 src_install() {
 
-    insopts -m0755
-    insinto /usr/bin
-    doins qtmindmap
-
-    insinto /usr/share/qtmindmap/i18n
-    if use "linguas_hu"; then
-      doins "${S}"/qtmindmap-qtmindmap/lang/qtmindmap_hu.qm
-    fi
-
-    if use "linguas_nb"; then
-      doins "${S}"/qtmindmap-qtmindmap/lang/qtmindmap_nb_NO.qm
-    fi
+  qt4-r2_src_install
 }
\ No newline at end of file
diff --git a/qtmindmap.desktop b/other/qtmindmap.desktop
similarity index 100%
rename from qtmindmap.desktop
rename to other/qtmindmap.desktop
diff --git a/qtmindmap.pro b/qtmindmap.pro
index 8c24f90..9036105 100644
--- a/qtmindmap.pro
+++ b/qtmindmap.pro
@@ -44,7 +44,7 @@ target.path = /usr/bin
 translations.files += .qm/i18n
 translations.path += /usr/share/qtmindmap
 
-desktop.files += qtmindmap.desktop
+desktop.files += other/qtmindmap.desktop
 desktop.path += /usr/share/applications
 
 icon.files += images/qtmindmap.svg