diff --git a/sj3mkdic/GramTable b/GramTable
similarity index 100%
rename from sj3mkdic/GramTable
rename to GramTable
diff --git a/Makefile b/Makefile
index ea34bf1..6fb512e 100644
--- a/Makefile
+++ b/Makefile
@@ -34,11 +34,13 @@ CFLAGS += -fPIC
 CPPFLAGS += -I. -I./include -I./sj3h
 LDFLAGS += -L.
 
-SJ3LIB_OBJS  = level1.o sj3lib.o string.o
-SJ3RKCV_OBJS = rk_conv.o sj3_rkcv.o wc16_str.o
-SJ3STAT_OBJS = sj3stat.o
+SJ3LIB_OBJS   = level1.o sj3lib.o string.o
+SJ3RKCV_OBJS  = rk_conv.o sj3_rkcv.o wc16_str.o
+SJ3MKDIC_OBJS = char.o cnvhinsi.o file.o global.o hindo.o knjcvt.o makedict.o \
+                makelist.o makeseg.o memory.o offset.o readline.o string2.o
+SJ3STAT_OBJS  = sj3stat.o
 
-all: libsj3lib.a libsj3lib.so.$(LIBVER) libsj3rkcv.a sj3stat
+all: libsj3lib.a libsj3lib.so.$(LIBVER) libsj3rkcv.a sj3mkdic sj3stat
 
 install: all
 	mkdir -p $(DESTDIR)$(BINDIR)
@@ -60,11 +62,15 @@ libsj3lib.so.$(LIBVER): $(SJ3LIB_OBJS) compats.o
 libsj3rkcv.a: $(SJ3RKCV_OBJS) compats.o
 	$(AR) crs $@ $(SJ3RKCV_OBJS) compats.o
 
+sj3mkdic: $(SJ3MKDIC_OBJS) libsj3lib.a compats.o
+	$(CC) -static -o $@ $(SJ3MKDIC_OBJS) compats.o $(LDFLAGS) $(LDLIBS) -lsj3lib
+
 sj3stat: $(SJ3STAT_OBJS) libsj3lib.a compats.o
 	$(CC) -static -o $@ $(SJ3STAT_OBJS) compats.o $(LDFLAGS) $(LDLIBS) -lsj3lib
 
 Paths.h: Paths.h.in
 	sed -e "s|@SJ3CONFDIR@|/etc/sj3|" -e "s|@SJ3DICTDIR@|$(SHAREDIR)/sj3/dict|" Paths.h.in > $@
 
-$(SJ3LIB_OBJS) $(SJ3STAT_OBJS) compats.o: config.h
-$(SJ3LIB_OBJS) $(SJ3STAT_OBJS): Paths.h
+$(SJ3LIB_OBJS) $(SJ3MKDIC_OBJS) $(SJ3STAT_OBJS) compats.o: config.h
+$(SJ3LIB_OBJS) $(SJ3MKDIC_OBJS) $(SJ3STAT_OBJS): Paths.h
+cnvhinsi.o: GramTable
diff --git a/sj3mkdic/char.c b/char.c
similarity index 100%
rename from sj3mkdic/char.c
rename to char.c
diff --git a/sj3mkdic/cnvhinsi.c b/cnvhinsi.c
similarity index 100%
rename from sj3mkdic/cnvhinsi.c
rename to cnvhinsi.c
diff --git a/sj3mkdic/dicttool.h b/dicttool.h
similarity index 100%
rename from sj3mkdic/dicttool.h
rename to dicttool.h
diff --git a/sj3mkdic/file.c b/file.c
similarity index 100%
rename from sj3mkdic/file.c
rename to file.c
diff --git a/sj3mkdic/global.c b/global.c
similarity index 100%
rename from sj3mkdic/global.c
rename to global.c
diff --git a/sj3mkdic/hindo.c b/hindo.c
similarity index 100%
rename from sj3mkdic/hindo.c
rename to hindo.c
diff --git a/sj3mkdic/knjcvt.c b/knjcvt.c
similarity index 100%
rename from sj3mkdic/knjcvt.c
rename to knjcvt.c
diff --git a/sj3mkdic/makedict.c b/makedict.c
similarity index 100%
rename from sj3mkdic/makedict.c
rename to makedict.c
diff --git a/sj3mkdic/makelist.c b/makelist.c
similarity index 100%
rename from sj3mkdic/makelist.c
rename to makelist.c
diff --git a/sj3mkdic/makeseg.c b/makeseg.c
similarity index 99%
rename from sj3mkdic/makeseg.c
rename to makeseg.c
index c639bad..2d53c0b 100644
--- a/sj3mkdic/makeseg.c
+++ b/makeseg.c
@@ -43,7 +43,7 @@
 #include <sys/types.h>
 #include <time.h>
 #include "sj_struct.h"
-#include "../../include/Dict.h"
+#include "Dict.h"
 #include "dicttool.h"
 
 extern	HindoRec *askknj[];
diff --git a/sj3mkdic/memory.c b/memory.c
similarity index 100%
rename from sj3mkdic/memory.c
rename to memory.c
diff --git a/sj3mkdic/offset.c b/offset.c
similarity index 100%
rename from sj3mkdic/offset.c
rename to offset.c
diff --git a/sj3mkdic/readline.c b/readline.c
similarity index 100%
rename from sj3mkdic/readline.c
rename to readline.c
diff --git a/sj3mkdic/sj_const.h b/sj_const.h
similarity index 100%
rename from sj3mkdic/sj_const.h
rename to sj_const.h
diff --git a/sj3mkdic/sj_macro.h b/sj_macro.h
similarity index 100%
rename from sj3mkdic/sj_macro.h
rename to sj_macro.h
diff --git a/sj3mkdic/sj_struct.h b/sj_struct.h
similarity index 100%
rename from sj3mkdic/sj_struct.h
rename to sj_struct.h
diff --git a/sj3mkdic/string.c b/string2.c
similarity index 100%
rename from sj3mkdic/string.c
rename to string2.c