diff --git a/srcpkgs/thunderbird/files/thunderbird.desktop b/srcpkgs/thunderbird/files/thunderbird.desktop
new file mode 100644
index 0000000000..9d14a67a6e
--- /dev/null
+++ b/srcpkgs/thunderbird/files/thunderbird.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Thunderbird
+Comment=Mail & News Reader
+Exec=thunderbird
+Icon=thunderbird.png
+Terminal=false
+Type=Application
+Categories=Application;Network;
+StartupNotify=true
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 5b3971b852..75fcf0751e 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -19,7 +19,20 @@ Mozilla Thunderbird is a redesign of the Mozilla mail component. The
 goal is to produce a cross platform stand alone mail application using
 the XUL user interface language. This version uses the gtk2 toolkit."
 
-Add_dependency full zip
-Add_dependency full gtk+
-Add_dependency full alsa-lib
-Add_dependency full libIDL
+Add_dependency run libstdc++
+Add_dependency run gtk+
+Add_dependency run xulrunner
+Add_dependency build zip
+Add_dependency build python
+Add_dependency build gtk+-devel
+Add_dependency build xulrunner-devel
+
+post_install()
+{
+	install -d ${DESTDIR}/usr/share/applications || return 1
+	install -d ${DESTDIR}/usr/share/pixmaps || return 1
+	install -m644 ${FILESDIR}/*.desktop \
+		${DESTDIR}/usr/share/applications || return 1
+	install -m644 ${wrksrc}/mail/branding/nightly/mailicon48.png \
+		${DESTDIR}/usr/share/pixmaps/thunderbird.png || return 1
+}
\ No newline at end of file