diff --git a/extensions/universalchardet/Makefile.in b/extensions/universalchardet/Makefile.in
new file mode 100644
index 000000000000..54e6f0867856
--- /dev/null
+++ b/extensions/universalchardet/Makefile.in
@@ -0,0 +1,36 @@
+#
+# The contents of this file are subject to the Netscape 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/NPL/
+#
+# 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 Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= src
+
+ifdef ENABLE_TESTS
+DIRS		+= tests
+endif
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/extensions/universalchardet/src/Makefile.in b/extensions/universalchardet/src/Makefile.in
new file mode 100644
index 000000000000..52edc781211b
--- /dev/null
+++ b/extensions/universalchardet/src/Makefile.in
@@ -0,0 +1,67 @@
+#
+# The contents of this file are subject to the Netscape 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/NPL/
+#
+# 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 Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= universalchardet
+LIBRARY_NAME	= universalchardet
+EXPORT_LIBRARY	= 1
+IS_COMPONENT	= 1
+MODULE_NAME	= nsUniversalCharDetModule
+SHORT_LIBNAME	= ucdet
+REQUIRES	= xpcom string uconv chardet
+
+CPPSRCS = \
+		CharDistribution.cpp \
+		JpCntx.cpp \
+		LangBulgarianModel.cpp \
+		LangCyrillicModel.cpp \
+		LangGreekModel.cpp \
+		LangHungarianModel.cpp \
+		LangThaiModel.cpp \
+		nsBig5Prober.cpp \
+		nsEUCJPProber.cpp \
+		nsEUCKRProber.cpp \
+		nsEUCTWProber.cpp \
+		nsEscCharsetProber.cpp \
+		nsEscSM.cpp \
+		nsGB2312Prober.cpp \
+		nsMBCSGroupProber.cpp \
+		nsMBCSSM.cpp \
+		nsSBCSGroupProber.cpp \
+		nsSBCharSetProber.cpp \
+		nsSJISProber.cpp \
+		nsUTF8Prober.cpp \
+		nsUniversalCharDetModule.cpp \
+		nsUniversalDetector.cpp \
+		$(NULL)
+
+EXTRA_DSO_LDOPTS += \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/extensions/universalchardet/tests/Makefile.in b/extensions/universalchardet/tests/Makefile.in
new file mode 100644
index 000000000000..ad93f6944a9d
--- /dev/null
+++ b/extensions/universalchardet/tests/Makefile.in
@@ -0,0 +1,45 @@
+#
+# The contents of this file are subject to the Netscape 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/NPL/
+#
+# 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 Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= universalchardet
+REQUIRES	= xpcom chardet
+
+CPPSRCS		= \
+		UniversalChardetTest.cpp \
+		$(NULL)
+
+SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
+
+include $(topsrcdir)/config/config.mk
+
+LIBS		+= \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+