diff --git a/network/mail/thunderbird/actions.py b/network/mail/thunderbird/actions.py
index 81320fe615..adfa56aca4 100644
--- a/network/mail/thunderbird/actions.py
+++ b/network/mail/thunderbird/actions.py
@@ -10,12 +10,12 @@ from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
 
 def install():
-    pisitools.insinto("/opt", "*")
+    pisitools.insinto("/opt/thunderbird", "*")
     shelltools.system("mkdir -p %s/usr/bin" % get.installDIR())
-    shelltools.system("ln -s %s/opt/thunderbird %s/usr/bin/thunderbird" % (get.installDIR(), get.installDIR()))
+    shelltools.system("ln -s %s/opt/thunderbird/thunderbird %s/usr/bin/thunderbird" % (get.installDIR(), get.installDIR()))
     for i in ("16", "22", "24", "32", "48", "64", "128", "256"):
         pisitools.dodir("/usr/share/icons/hicolor/%sx%s/apps" % (i, i))
-        pisitools.domove("/opt/chrome/icons/default/default%s.png" % (i), "/usr/share/icons/hicolor/%sx%s/apps" % (i, i),"thunderbird.png")
+        pisitools.domove("/opt/thunderbird/chrome/icons/default/default%s.png" % (i), "/usr/share/icons/hicolor/%sx%s/apps" % (i, i),"thunderbird.png")
     # Use system certificates
     pisitools.dodir("/usr/lib")
-    shelltools.system("ln -s %s/opt/libnssckbi.so %s/usr/lib/libnssckbi.so" % (get.installDIR(), get.installDIR()))
+    shelltools.system("ln -s %s/opt/thunderbird/libnssckbi.so %s/usr/lib/libnssckbi.so" % (get.installDIR(), get.installDIR()))