diff --git a/scim-wnn/configure.ac b/scim-wnn/configure.ac
index 21698ae..01b5871 100644
--- a/scim-wnn/configure.ac
+++ b/scim-wnn/configure.ac
@@ -120,6 +120,7 @@
SCIM_ICONDIR=`$PKG_CONFIG --variable=icondir scim`
SCIM_MODULEDIR=`$PKG_CONFIG --variable=moduledir scim`
+SCIM_DATADIR=`$PKG_CONFIG --variable=scimdatadir scim`
if test "x$SCIM_ICONDIR" = "x"; then
SCIM_ICONDIR=${datadir}/scim/icons
@@ -131,6 +132,7 @@
AC_SUBST(SCIM_ICONDIR)
AC_SUBST(SCIM_MODULEDIR)
+AC_SUBST(SCIM_DATADIR)
AC_CONFIG_FILES([Makefile intl/Makefile po/Makefile.in m4/Makefile
src/Makefile data/Makefile])
diff --git a/scim-wnn/data/Makefile.am b/scim-wnn/data/Makefile.am
index f0137c0..1b0ff3b 100644
--- a/scim-wnn/data/Makefile.am
+++ b/scim-wnn/data/Makefile.am
@@ -2,5 +2,6 @@
icondir = $(SCIM_ICONDIR)
icon_DATA = scim-wnn.png
-
-EXTRA_DIST = $(icon_DATA)
+tabledir = $(SCIM_DATADIR)/scim-wnn
+table_DATA = scim-wnn-def.rkt like-msime.rkt
+EXTRA_DIST = $(icon_DATA) $(table_DATA)
diff --git a/scim-wnn/m4/Makefile b/scim-wnn/m4/Makefile
index 9f2b2cb..8e1531e 100644
--- a/scim-wnn/m4/Makefile
+++ b/scim-wnn/m4/Makefile
@@ -146,6 +146,7 @@
SCIM_BUILD_SETUP_FALSE = #
SCIM_BUILD_SETUP_TRUE =
SCIM_CFLAGS = -I/usr/include/scim-1.0
+SCIM_DATADIR = /usr/share/scim
SCIM_DEBUG_FLAGS =
SCIM_GTKUTILS_CFLAGS = -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -I/usr/include/scim-1.0 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
SCIM_GTKUTILS_LIBS = -Wl,--export-dynamic -lscim-gtkutils-1.0 -lgtk-x11-2.0 -lscim-1.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
diff --git a/scim-wnn/m4/Makefile.in b/scim-wnn/m4/Makefile.in
index 6a419e9..8e68db6 100644
--- a/scim-wnn/m4/Makefile.in
+++ b/scim-wnn/m4/Makefile.in
@@ -146,6 +146,7 @@
SCIM_BUILD_SETUP_FALSE = @SCIM_BUILD_SETUP_FALSE@
SCIM_BUILD_SETUP_TRUE = @SCIM_BUILD_SETUP_TRUE@
SCIM_CFLAGS = @SCIM_CFLAGS@
+SCIM_DATADIR = @SCIM_DATADIR@
SCIM_DEBUG_FLAGS = @SCIM_DEBUG_FLAGS@
SCIM_GTKUTILS_CFLAGS = @SCIM_GTKUTILS_CFLAGS@
SCIM_GTKUTILS_LIBS = @SCIM_GTKUTILS_LIBS@
diff --git a/scim-wnn/src/Makefile.am b/scim-wnn/src/Makefile.am
index efe11ff..4b6e016 100644
--- a/scim-wnn/src/Makefile.am
+++ b/scim-wnn/src/Makefile.am
@@ -22,6 +22,7 @@
-I$(top_srcdir)/src \
-DSCIM_ICONDIR=\"@SCIM_ICONDIR@\" \
-DSCIM_WNN_LOCALEDIR=\"$(datadir)/locale\" \
+ -DSCIM_WNN_DATADIR=\"@SCIM_DATADIR@/scim-wnn\" \
-DSCIM_WNN_ICON_FILE=\"@SCIM_ICONDIR@/scim-wnn.png\"
noinst_HEADERS = scim_wnn_imengine.h wnnproto.h romkan.h romkan_table.h \