diff --git a/debian/control b/debian/control
index 4fc02cf..31775c2 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@
 Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~),
 	libibus-dev (>= 1.2), libcurl4-openssl-dev, pkg-config, 
 	python-dev, gyp (>=0.1~svn824), protobuf-compiler, libgtest-dev,
-	libprotobuf-dev, libqt4-dev, libscim-dev
+	libprotobuf-dev, libqt4-dev, libscim-dev, libuim-dev
 Standards-Version: 3.9.0
 Homepage: http://code.google.com/p/mozc/
 
@@ -43,6 +43,24 @@
  .
  This open-source project originates from Google Japanese Input.
 
+Package: uim-mozc
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, uim, mozc-server (= ${binary:Version})
+Description: Mozc engine for uim - Client of the Mozc input method
+ uim is a input method module library supporting various languages, which
+ become a frontend for Anthy, SKK, Canna, T-Code, TUT-Code, 
+ Pinyin(Chinese input method), Hangul(Korean input method), 
+ IPA(International Phonetic Alphabet) and etc....
+ Most of the functions are implemented with Scheme, so it's very simple
+ and flexible. 
+ .
+ Mozc is a Japanese Input Method Editor (IME) designed for multi-platform
+ such as Chromium OS, Windows, Mac and Linux.
+ .
+ scim-mozc provides client part of the Mozc input method.
+ .
+ This open-source project originates from Google Japanese Input.
+
 Package: mozc-server
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/rules b/debian/rules
index b1a04e6..30ad500 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,10 @@
 # -*- makefile -*-
 #
 BUILD_DIR=./out_linux
-TARGETS=unix/ibus/ibus.gyp:ibus_mozc unix/scim/scim.gyp:scim_mozc\
-	unix/scim/scim.gyp:scim_mozc_setup server/server.gyp:mozc_server\
-	gui/gui.gyp:mozc_tool
+TARGETS=unix/ibus/ibus.gyp:ibus_mozc \
+	unix/scim/scim.gyp:scim_mozc unix/scim/scim.gyp:scim_mozc_setup \
+	unix/uim/uim.gyp:uim-mozc \
+	server/server.gyp:mozc_server gui/gui.gyp:mozc_tool
 
 # for architecture dependent variables and changelog vars
 vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1)))
@@ -39,9 +40,9 @@
 	sed -e 's|/usr/libexec/ibus-engine-mozc|/usr/lib/ibus-mozc/ibus-engine-mozc|' \
 		-e 's|0\.0\.0\.0|$(SOURCE_VERSION)|g' < $(BUILD_DIR)/Release/obj/gen/unix/ibus/mozc.xml > \
 		$(CURDIR)/debian/ibus-mozc/usr/share/ibus/component/mozc.xml
-	install -D -m 0644 $(CURDIR)/debian/product_icon.png \
+	install -D -m 0644 $(CURDIR)/debian/images/mozc_icon.png \
 		$(CURDIR)/debian/ibus-mozc/usr/share/ibus-mozc/product_icon.png
-	ln -s /usr/share/ibus-mozc/product_icon.png \
+	install -D -m 0644 $(CURDIR)/debian/images/mozc_tool.png \
 		$(CURDIR)/debian/ibus-mozc/usr/share/ibus-mozc/unknown.ico
 
 	# scim-mozc
@@ -49,10 +50,23 @@
 		$(CURDIR)/debian/scim-mozc/$(SCIM_MODDIR)/IMEngine/mozc.so
 	install -D -m 0755 $(BUILD_DIR)/Release/lib.target/libscim_mozc_setup.so \
 		$(CURDIR)/debian/scim-mozc/$(SCIM_MODDIR)/SetupUI/mozc-setup.so
-	install -D -m 0644 $(CURDIR)/debian/product_icon.png \
+	install -D -m 0644 $(CURDIR)/debian/images/mozc_icon.png \
 		$(CURDIR)/debian/scim-mozc/usr/share/scim/icons/scim-mozc.png
-	install -D -m 0644 $(CURDIR)/debian/product_icon.png \
+	install -D -m 0644 $(CURDIR)/debian/images/mozc_tool.png \
 		$(CURDIR)/debian/scim-mozc/usr/share/scim/icons/scim-mozc-tool.png
+	install -D -m 0644 $(CURDIR)/debian/images/mozc_dic.png \
+		$(CURDIR)/debian/scim-mozc/usr/share/scim/icons/scim-mozc-dictionary.png
+	install -D -m 0644 $(CURDIR)/debian/images/mozc_setup.png \
+		$(CURDIR)/debian/scim-mozc/usr/share/scim/icons/scim-mozc-property.png
+
+	# uim-mozc
+	install -D -m 0755  $(BUILD_DIR)/Release/libuim-mozc.so \
+		$(CURDIR)/debian/uim-mozc/usr/lib/uim/plugin/libuim-mozc.so
+	install -d $(CURDIR)/debian/uim-mozc/usr/share/uim
+	# mozc-custom.scm, mozc-key-custom.scm, mozc.scm
+	install -m 644 $(CURDIR)/unix/uim/scm/* $(CURDIR)/debian/uim-mozc/usr/share/uim/
+	install -D -m 0644 $(CURDIR)/debian/images/mozc_icon.png \
+		$(CURDIR)/debian/uim-mozc/usr/share/uim/pixmaps/mozc.png
 
 	# mozc-server
 	install -D -m 0755 $(BUILD_DIR)/Release/mozc_server \