diff --git a/src/oxt/Makefile.in b/src/oxt/Makefile.in
index bfc316e..e75b74d 100644
--- a/src/oxt/Makefile.in
+++ b/src/oxt/Makefile.in
@@ -90,24 +90,25 @@ $(OBJRLS)/%.o: %.cxx $(OBJDIR)/uno/include/br/com/bb/$(PACKAGE).hpp Makefile
 
 #---[ Release targets ]--------------------------------------------------------------------------------
 
-Release: $(PACKAGE).oxt
+Release: $(BINDIR)/$(PACKAGE).oxt
 
-$(PACKAGE).oxt: $(BINRLS)/$(PACKAGE).uno@DLLEXT@ $(PACKAGE).uno.rdb description.xml manifest.xml description.txt
-	@$(MKDIR) $(BINDIR)/$(PACKAGE).oxt
+$(BINDIR)/$(PACKAGE).oxt: $(BINRLS)/$(PACKAGE).uno@DLLEXT@ $(PACKAGE).uno.rdb description.xml manifest.xml description.txt
+	@rm -f $@
+
+	@$(MKDIR) $(BINDIR)/$(PACKAGE).oxt.tmp
+
+	@$(MKDIR) $(BINDIR)/$(PACKAGE).oxt.tmp/META-INF
+	@cp manifest.xml $(BINDIR)/$(PACKAGE).oxt.tmp/META-INF
 
-	@$(MKDIR) $(BINDIR)/$(PACKAGE).oxt/META-INF
-	@cp description.xml $(BINDIR)/$(PACKAGE).oxt/META-INF
-	@cp manifest.xml $(BINDIR)/$(PACKAGE).oxt/META-INF
+	@cp description.xml $(BINDIR)/$(PACKAGE).oxt.tmp
+	@cp description.txt $(BINDIR)/$(PACKAGE).oxt.tmp
 
-	@cp description.txt $(BINDIR)/$(PACKAGE).oxt
-	@$(CONVERT) ../pw3270/pixmaps/pw3270.svg --format=png > $(BINDIR)/$(PACKAGE).oxt/$(PACKAGE).png
+	@$(CONVERT) ../pw3270/pixmaps/pw3270.svg --format=png > $(BINDIR)/$(PACKAGE).oxt.tmp/$(PACKAGE).png
 
-	@$(MKDIR) $(BINDIR)/$(PACKAGE).oxt/linux
-	@cp $(BINRLS)/$(PACKAGE).uno@DLLEXT@ $(BINDIR)/$(PACKAGE).oxt/linux
-	@cp $(PACKAGE).uno.rdb $(BINDIR)/$(PACKAGE).oxt
-	@rm -f $(BINDIR)/$(PACKAGE).zip
-	@cd $(BINDIR)/$(PACKAGE).oxt ; $(ZIP) -r ../$(PACKAGE).zip .
-	@mv $(BINDIR)/$(PACKAGE).zip $@
+	@cp $(BINRLS)/$(PACKAGE).uno@DLLEXT@ $(BINDIR)/$(PACKAGE).oxt.tmp
+	@cp $(PACKAGE).uno.rdb $(BINDIR)/$(PACKAGE).oxt.tmp
+	@rm -f $(BINDIR)/$(PACKAGE).oxt
+	@cd $(BINDIR)/$(PACKAGE).oxt.tmp ; $(ZIP) -r -m ../$(PACKAGE).oxt .
 	@echo $@ Ok.
 
 $(BINRLS)/$(PACKAGE).uno@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o)
diff --git a/src/oxt/description.xml.in b/src/oxt/description.xml.in
index 3d1de59..327d444 100644
--- a/src/oxt/description.xml.in
+++ b/src/oxt/description.xml.in
@@ -7,7 +7,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink">
 
   <identifier value="@PACKAGE_NAME@" />
 
-  <platform value="linux_x86" />
+  <platform value="linux_@host_cpu@" />
 
   <dependencies>
     <OpenOffice.org-minimal-version value="2.2" d:name="OpenOffice.org 2.2"/>
diff --git a/src/oxt/manifest.xml.in b/src/oxt/manifest.xml.in
index 28c639f..826cc22 100644
--- a/src/oxt/manifest.xml.in
+++ b/src/oxt/manifest.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest:manifest>
-<manifest:file-entry manifest:media-type= "application/vnd.sun.star.uno-component;type=native;platform=Linux_x86" manifest:full-path="@PACKAGE_NAME@.uno.so"/>
+<manifest:file-entry manifest:media-type= "application/vnd.sun.star.uno-component;type=native;platform=Linux_@host_cpu@" manifest:full-path="@PACKAGE_NAME@.uno.so"/>
 <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-typelibrary;type=RDB" manifest:full-path="@PACKAGE_NAME@.uno.rdb"/>
 </manifest:manifest>
 
--
libgit2 0.21.2