diff --git a/misc/Makefile b/misc/Makefile
index 34c058873620..6511827d6346 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -400,6 +400,7 @@
     SUBDIR += tempcontrol
     SUBDIR += terraform
     SUBDIR += tet
+    SUBDIR += thailocale
     SUBDIR += tkcron
     SUBDIR += tkinfo
     SUBDIR += tkman
diff --git a/misc/thailocale/Makefile b/misc/thailocale/Makefile
new file mode 100644
index 000000000000..adfd1d8d013e
--- /dev/null
+++ b/misc/thailocale/Makefile
@@ -0,0 +1,28 @@
+# New ports collection makefile for:   thailocale
+# Date created:        5 January 2005
+# Whom:                Thawatchai Piyawat <piyawat@usablelabs.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	thailocale
+PORTVERSION=	0.11
+CATEGORIES=	misc
+MASTER_SITES=	http://www.usablelabs.com/download/
+
+MAINTAINER=	piyawat@usablelabs.com
+COMMENT=	A locale for Thai in Thailand, TIS-620 character set
+
+USE_REINPLACE=	yes
+PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
+
+pre-configure: 
+	${REINPLACE_CMD} -e "s|/usr/share|${PREFIX}/share|" ${WRKSRC}/Makefile 
+ 
+post-install: 
+	@${ECHO_MSG} 
+	@${CAT} ${PKGMESSAGE} 
+	@${ECHO_MSG}
+
+.include <bsd.port.mk>
diff --git a/misc/thailocale/distinfo b/misc/thailocale/distinfo
new file mode 100644
index 000000000000..2a9ac179a246
--- /dev/null
+++ b/misc/thailocale/distinfo
@@ -0,0 +1,2 @@
+MD5 (thailocale-0.11.tar.gz) = 32f909128dc7dad672e2ef3fcd22e8aa
+SIZE (thailocale-0.11.tar.gz) = 6154
diff --git a/misc/thailocale/files/patch-Makefile b/misc/thailocale/files/patch-Makefile
new file mode 100644
index 000000000000..62856b694d0e
--- /dev/null
+++ b/misc/thailocale/files/patch-Makefile
@@ -0,0 +1,25 @@
+--- Makefile.orig	Thu Jan  6 06:26:30 2005
++++ Makefile	Fri Feb 25 23:20:52 2005
+@@ -45,8 +45,8 @@
+ .endif
+ 
+ install: lc_all check
+-	mkdir ${PATH}	
+-	cp LC_CTYPE LC_COLLATE LC_MONETARY LC_NUMERIC LC_TIME LC_MESSAGES ${PATH}
++	mkdir -p ${PATH}
++	install -m 444 LC_CTYPE LC_COLLATE LC_MONETARY LC_NUMERIC LC_TIME LC_MESSAGES ${PATH}
+ 	ln -sf ${PATH} ${LPATH}
+ 	@echo
+ 	@echo "Installation successfully completed"
+@@ -67,5 +67,10 @@
+ 	@echo
+ 
+ clean:
+-	-rm LC_CTYPE LC_COLLATE
++.if exists(LC_CTYPE)
++	rm LC_CTYPE
++.endif
++.if exists(LC_COLLATE)
++	rm LC_COLLATE
++.endif
+ 
diff --git a/misc/thailocale/files/pkg-message.in b/misc/thailocale/files/pkg-message.in
new file mode 100644
index 000000000000..f529fa8ccd12
--- /dev/null
+++ b/misc/thailocale/files/pkg-message.in
@@ -0,0 +1,4 @@
+Set the variable PATH_LOCALE to %%PREFIX%%/share/locale and export it, 
+e.g.: 
+ 
+export PATH_LOCALE=%%PREFIX%%/share/locale 
diff --git a/misc/thailocale/pkg-descr b/misc/thailocale/pkg-descr
new file mode 100644
index 000000000000..a654b17f74c3
--- /dev/null
+++ b/misc/thailocale/pkg-descr
@@ -0,0 +1,9 @@
+This software is a POSIX Thai locale definition (Thai in Thailand) for 
+FreeBSD. It defines data files for the character set TIS 620.2533. 
+Once installed, it adds a locale 'th_TH.TIS-620' (and an alias 'th_TH') 
+to your system.
+
+WWW: http://www.usablelabs.com/download/thailocale-0.11.tar.gz
+
+Thawatchai Piyawat
+piyawat@usablelabs.com
diff --git a/misc/thailocale/pkg-plist b/misc/thailocale/pkg-plist
new file mode 100644
index 000000000000..0297a446d49e
--- /dev/null
+++ b/misc/thailocale/pkg-plist
@@ -0,0 +1,9 @@
+share/locale/th_TH.TIS-620/LC_COLLATE
+share/locale/th_TH.TIS-620/LC_CTYPE
+share/locale/th_TH.TIS-620/LC_MESSAGES
+share/locale/th_TH.TIS-620/LC_MONETARY
+share/locale/th_TH.TIS-620/LC_NUMERIC
+share/locale/th_TH.TIS-620/LC_TIME
+@exec ln -sf %D/share/locale/th_TH.TIS-620 %D/share/locale/th_TH
+@dirrm share/locale/th_TH.TIS-620
+@unexec rm -f %D/share/locale/th_TH