diff --git a/game/simulation/flightgear/actions.py b/game/simulation/flightgear/actions.py
index 3423bcb852..14c920354a 100644
--- a/game/simulation/flightgear/actions.py
+++ b/game/simulation/flightgear/actions.py
@@ -10,8 +10,11 @@ from pisi.actionsapi import pisitools
 from pisi.actionsapi import get
 
 def setup():
+    shelltools.system("sed -i 's|Exec=.*|Exec=fgfs --fg-root=/usr/share/flightgear/data|' package/org.flightgear.FlightGear.desktop.in")
+
     cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \
                          -DCMAKE_INSTALL_LIBDIR=lib    \
+                         -DCMAKE_INSTALL_DATADIR=/usr/share \
                          -DFG_DATA_DIR=/usr/share/flightgear")
 
 def build():
@@ -19,5 +22,7 @@ def build():
     
 def install():
     cmaketools.install()
-    
+
+    shelltools.copy("%s/usr/appdir/usr/share/*" % get.installDIR(), "%s/usr/share/" % get.installDIR())
+    pisitools.removeDir("/usr/appdir")
     pisitools.dodoc("README*", "ChangeLog", "AUTHORS", "NEWS", "Thanks")
diff --git a/game/simulation/flightgear/pspec.xml b/game/simulation/flightgear/pspec.xml
index 25767f7140..71117a5633 100644
--- a/game/simulation/flightgear/pspec.xml
+++ b/game/simulation/flightgear/pspec.xml
@@ -75,10 +75,12 @@
             <Path fileType="executable">/usr/bin</Path>
             <Path fileType="data">/usr/share/pixmaps</Path>
             <Path fileType="data">/usr/share/zsh</Path>
+            <Path fileType="data">/usr/share/icons</Path>
             <Path fileType="data">/usr/share/icons/hicolor</Path>
             <Path fileType="data">/usr/share/bash-completion/completions</Path>
             <Path fileType="data">/usr/share/flightgear/</Path>
             <Path fileType="data">/usr/share/applications</Path>
+            <Path fileType="data">/usr/share/metainfo</Path>
         </Files>
         <AdditionalFiles>
             <AdditionalFile owner="root" permission="0644" target="/usr/share/pixmaps/flightgear.png">flightgear.png</AdditionalFile>