diff --git a/configure.ac b/configure.ac
index 7471104..ab15284 100644
--- a/configure.ac
+++ b/configure.ac
@@ -489,10 +489,10 @@ if test "$IDLC" == "no" ; then
 	app_cv_office="no"
 fi
 
-#AC_PATH_TOOL([UCPP], ucpp, "no", path=$PATH:$OO_SDK_HOME/bin)
-#if test "$UCPP" == "no" ; then
-#	app_cv_office="no"
-#fi
+AC_PATH_TOOL([UNOPKG], unopkg, "no", path=$PATH:$OO_SDK_HOME/bin)
+if test "$UNOPKG" == "no" ; then
+	app_cv_office="no"
+fi
 
 AC_PATH_TOOL([REGMERGE], regmerge, "no", path=$PATH:$OO_SDK_URE_BIN_DIR)
 if test "$REGMERGE" == "no" ; then
diff --git a/src/openoffice/Makefile.in b/src/openoffice/Makefile.in
index 86fbfb9..573889c 100644
--- a/src/openoffice/Makefile.in
+++ b/src/openoffice/Makefile.in
@@ -128,6 +128,9 @@ include/$(PACKAGE_NAME)/lib3270.hpp: $(RDBDIR)/$(PACKAGE_NAME).rdb
 
 Debug: $(BINDBG)/$(PACKAGE_NAME).oxt
 
+add: $(BINDBG)/$(PACKAGE_NAME).oxt
+	@$(UNOPKG) add --verbose --force $(BINDBG)/$(PACKAGE_NAME).oxt
+
 $(BINDBG)/testprogram: $(OBJDBG)/testprogram@OBJEXT@ $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@)
 	@echo $@ ...
 	@$(MKDIR) `dirname $@`
@@ -166,6 +169,7 @@ $(BINDBG)/$(PACKAGE_NAME).oxt: \
 	@cp $(BINDBG)/$(PACKAGE_NAME).uno@DLLEXT@ $(BINDBG)/$(PACKAGE_NAME).oxt.tmp
 	@cp $(PACKAGE_NAME).rdb $(BINDBG)/$(PACKAGE_NAME).oxt.tmp
 	@cd $(BINDBG)/$(PACKAGE).oxt.tmp ; $(ZIP) -r -m ../$(PACKAGE_NAME).oxt .
+	@rm -fr $(BINDBG)/$(PACKAGE).oxt.tmp
 	@echo $@ Ok.
 
 
diff --git a/src/openoffice/description.xml.in b/src/openoffice/description.xml.in
index 3d1de59..327d444 100644
--- a/src/openoffice/description.xml.in
+++ b/src/openoffice/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/openoffice/manifest.xml.in b/src/openoffice/manifest.xml.in
index 1b57453..8908827 100644
--- a/src/openoffice/manifest.xml.in
+++ b/src/openoffice/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@.rdb"/>
 </manifest:manifest>
 
--
libgit2 0.21.2