--- Makefile.orig	Fri Sep  1 17:13:10 2006
+++ Makefile	Fri Sep  1 17:13:42 2006
@@ -19,7 +19,7 @@
 XPI_EXTRA_FILES = install.js
 endif
 ifeq ($(MOZILLA_PLATFORM),tbird)
-REAL_CONFIG = mozilla-thunderbird-config
+REAL_CONFIG = thunderbird-config
 XPI_VERSION := $(XPI_VERSION)-tb${MOZILLA_VERSION}
 XPI_EXTRA_FILES = install.rdf
 endif
@@ -36,7 +36,7 @@
 	PLATFORM_FILES = platform/
 else
 	PLATFORM_FILES = components/libtraybiff.so
-	XPI_VERSION := $(XPI_VERSION)-$(PLATFORM)
+	XPI_VERSION := $(XPI_VERSION)
 endif
 
 export DEBUG MOZ_TRUNK MOZILLA_PLATFORM REAL_CONFIG