diff --git a/.gitignore b/.gitignore
index 56e89c6..0f99c38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ libthai-0.1.12.tar.gz
 libdatrie-0.2.2.tar.gz
 /libdatrie-0.2.6.tar.xz
 /libthai-0.1.19.tar.xz
+/libdatrie-0.2.8.tar.xz
+/libthai-0.1.20.tar.xz
diff --git a/libthai-libdatrie-static-build.patch b/libthai-libdatrie-static-build.patch
index c372c40..34a888c 100644
--- a/libthai-libdatrie-static-build.patch
+++ b/libthai-libdatrie-static-build.patch
@@ -1,18 +1,20 @@
-diff -up libthai-0.1.12/libdatrie-0.2.2/datrie/Makefile.am.static-build libthai-0.1.12/libdatrie-0.2.2/datrie/Makefile.am
---- libthai-0.1.12/libdatrie/datrie/Makefile.am.static-build	2009-04-13 05:18:20.000000000 -0400
-+++ libthai-0.1.12/libdatrie/datrie/Makefile.am	2009-06-27 17:58:06.813631702 -0400
+Index: libthai-0.1.20/libdatrie/datrie/Makefile.am
+===================================================================
+--- libthai-0.1.20.orig/libdatrie/datrie/Makefile.am
++++ libthai-0.1.20/libdatrie/datrie/Makefile.am
 @@ -10,7 +10,7 @@ EXTRA_DIST = libdatrie.map libdatrie.def
  
- INCLUDES = -I$(top_srcdir)
+ AM_CPPFLAGS = -I$(top_srcdir)
  
 -lib_LTLIBRARIES = libdatrie.la
 +noinst_LTLIBRARIES = libdatrie.la
  
  libdatrie_la_SOURCES =	\
  	typedefs.h	\
-diff -up libthai-0.1.12/libthai.pc.in.static-build libthai-0.1.12/libthai.pc.in
---- libthai-0.1.12/libthai.pc.in.static-build	2009-03-31 00:25:23.000000000 -0400
-+++ libthai-0.1.12/libthai.pc.in	2009-06-27 17:58:06.814631492 -0400
+Index: libthai-0.1.20/libthai.pc.in
+===================================================================
+--- libthai-0.1.20.orig/libthai.pc.in
++++ libthai-0.1.20/libthai.pc.in
 @@ -6,6 +6,5 @@ includedir=@includedir@
  Name: libthai
  Description: Thai support library
@@ -20,10 +22,11 @@ diff -up libthai-0.1.12/libthai.pc.in.static-build libthai-0.1.12/libthai.pc.in
 -Requires.private: datrie-0.2
  Libs: -L${libdir} -lthai
  Cflags: -I${includedir}
-diff -up libthai-0.1.12/src/Makefile.am.static-build libthai-0.1.12/src/Makefile.am
---- libthai-0.1.12/src/Makefile.am.static-build	2009-06-07 03:20:15.000000000 -0400
-+++ libthai-0.1.12/src/Makefile.am	2009-06-27 17:59:20.060630864 -0400
-@@ -19,7 +19,8 @@ libthai_sublibs = \
+Index: libthai-0.1.20/src/Makefile.am
+===================================================================
+--- libthai-0.1.20.orig/src/Makefile.am
++++ libthai-0.1.20/src/Makefile.am
+@@ -18,7 +18,8 @@ libthai_sublibs = \
  	$(top_builddir)/src/thwchar/libthwchar.la \
  	$(top_builddir)/src/thwctype/libthwctype.la \
  	$(top_builddir)/src/thwstr/libthwstr.la \
@@ -33,10 +36,11 @@ diff -up libthai-0.1.12/src/Makefile.am.static-build libthai-0.1.12/src/Makefile
  
  if LD_HAS_VERSION_SCRIPT
  EXPORTS_FLAGS = -Wl,-version-script -Wl,$(srcdir)/libthai.map
-diff -up libthai-0.1.12/src/thbrk/Makefile.am.static-build libthai-0.1.12/src/thbrk/Makefile.am
---- libthai-0.1.12/src/thbrk/Makefile.am.static-build	2009-01-19 08:32:50.000000000 -0500
-+++ libthai-0.1.12/src/thbrk/Makefile.am	2009-06-27 17:58:06.812632123 -0400
-@@ -16,5 +16,4 @@ libthbrk_la_SOURCES =	\
+Index: libthai-0.1.20/src/thbrk/Makefile.am
+===================================================================
+--- libthai-0.1.20.orig/src/thbrk/Makefile.am
++++ libthai-0.1.20/src/thbrk/Makefile.am
+@@ -15,5 +15,4 @@ libthbrk_la_SOURCES =	\
  	brk-maximal.c	\
  	brk-maximal.h
  
diff --git a/libthai.spec b/libthai.spec
index 60427b7..8c4f32a 100644
--- a/libthai.spec
+++ b/libthai.spec
@@ -1,9 +1,9 @@
-%define datrie_version 0.2.6
+%define datrie_version 0.2.8
 
 Summary:  Thai language support routines
 Name: libthai
-Version: 0.1.19
-Release: 2%{?dist}
+Version: 0.1.20
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz
@@ -61,7 +61,6 @@ mv libdatrie-%{datrie_version} libdatrie
 
 {
   pushd libdatrie
-  mkdir m4
   autoreconf -i -f
   %configure
   make
@@ -111,6 +110,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Apr 23 2014 Daiki Ueno <dueno@redhat.com> - 0.1.20-1
+- Update to 0.1.20
+- Update bundled libdatrie to 0.2.8
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.19-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 53240d3..6536327 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e253eb2433045f6e224c7fa44f9796e1  libdatrie-0.2.6.tar.xz
-c4a6c3842257889f8f15ae192b66e797  libthai-0.1.19.tar.xz
+fc25a7bf5ec7405e30ae1512a8e2226c  libdatrie-0.2.8.tar.xz
+2b58148d73361316121d5384efeda9e6  libthai-0.1.20.tar.xz