diff --git a/mozilla/extensions/java/xpcom/package/Makefile.in b/mozilla/extensions/java/xpcom/package/Makefile.in
new file mode 100755
index 00000000000..efd0a6678f2
--- /dev/null
+++ b/mozilla/extensions/java/xpcom/package/Makefile.in
@@ -0,0 +1,72 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# IBM Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Javier Pedemonte (jhpedemonte@gmail.com)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
+
+ifeq ($(OS_ARCH),WINNT)
+PKGCP_PLATFORM = dos
+PACKAGE_FILE = packages-win
+else
+PKGCP_PLATFORM=unix
+ifeq ($(OS_ARCH),Darwin)
+PACKAGE_FILE = packages-mac
+else
+PACKAGE_FILE = packages-unix
+endif
+endif
+
+PACKAGE_VERSION = 0.1
+
+xpi:
+	@echo Copying files to staging area...
+	rm -rf stage
+	$(NSINSTALL) -D stage
+	$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -o $(PKGCP_PLATFORM) -s $(DIST) -d stage -f $(srcdir)/$(PACKAGE_FILE) -v
+	@echo Creating install.js...
+	rm -f javaconnect.js
+	$(PERL) $(topsrcdir)/toolkit/mozapps/installer/makejs.pl $(srcdir)/javaconnect.jst $(PACKAGE_VERSION) stage/javaconnect
+	if ! test -e "javaconnect.js"; then $(NSINSTALL) $(srcdir)/javaconnect.js .; fi
+	@echo Creating XPI...
+	$(PERL) $(topsrcdir)/toolkit/mozapps/installer/makexpi.pl javaconnect stage .
diff --git a/mozilla/extensions/java/xpcom/package/javaconnect.jst b/mozilla/extensions/java/xpcom/package/javaconnect.jst
new file mode 100755
index 00000000000..bd10caf1701
--- /dev/null
+++ b/mozilla/extensions/java/xpcom/package/javaconnect.jst
@@ -0,0 +1,24 @@
+var err = initInstall("Mozilla Javaconnect", "Javaconnect", "0.1");
+logComment("initInstall: " + err);
+
+var fProgram = getFolder("Program");
+var srLibs = $SpaceRequired$:bin;
+
+if (verifyDiskSpace(fProgram, srLibs))
+{
+  err = addDirectory("", "0.1", "bin", fProgram, "", true);
+  logComment("addDirectory(): " + err);
+
+  if (err == SUCCESS)
+  {
+    err = performInstall();
+    logComment("performInstall() returned: " + err);
+  }
+  else
+  {
+    cancelInstall();
+    logComment("cancelInstall() due to error: "+err);
+  }
+}
+else
+  cancelInstall(INSUFFICIENT_DISK_SPACE);
diff --git a/mozilla/extensions/java/xpcom/package/packages-mac b/mozilla/extensions/java/xpcom/package/packages-mac
new file mode 100755
index 00000000000..303498c56a0
--- /dev/null
+++ b/mozilla/extensions/java/xpcom/package/packages-mac
@@ -0,0 +1,3 @@
+[javaconnect]
+bin/mozjava.jar
+bin/libjavaxpcom.jnilib
diff --git a/mozilla/extensions/java/xpcom/package/packages-unix b/mozilla/extensions/java/xpcom/package/packages-unix
new file mode 100755
index 00000000000..d1b5ade46ed
--- /dev/null
+++ b/mozilla/extensions/java/xpcom/package/packages-unix
@@ -0,0 +1,3 @@
+[javaconnect]
+bin/mozjava.jar
+bin/libjavaxpcom.so
diff --git a/mozilla/extensions/java/xpcom/package/packages-win b/mozilla/extensions/java/xpcom/package/packages-win
new file mode 100755
index 00000000000..2c8f4a49bd3
--- /dev/null
+++ b/mozilla/extensions/java/xpcom/package/packages-win
@@ -0,0 +1,3 @@
+[javaconnect]
+bin/mozjava.jar
+bin/javaxpcom.dll