diff --git a/debian/changelog b/debian/changelog
index 18a5489..76852b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fcitx-table-extra (0.3.2-1) experimental; urgency=low
+
+  * Install icons to correct place
+  * Imported Upstream version 0.3.2
+  * Add new packages: fcitx-table-zhengma-large
+
+ -- YunQiang Su <wzssyqa@gmail.com>  Sat, 18 Aug 2012 11:53:48 +0800
+
 fcitx-table-extra (0.3.1-1) unstable; urgency=low
 
   * New upstream release: Add wubi-large table.
diff --git a/debian/control b/debian/control
index d1541a5..407eadc 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@
 Maintainer: IME Packaging Team <pkg-ime-devel@lists.alioth.debian.org>
 Uploaders: Aron Xu <aron@debian.org>, YunQiang Su <wzssyqa@gmail.com>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), cmake, fcitx-libs-dev (>= 1:4.2.0),
-    fcitx-tools (>= 1:4.2.3), intltool
+Build-Depends: debhelper (>= 8), cmake, fcitx-libs-dev (>= 1:4.2.5),
+    fcitx-tools (>= 1:4.2.5), intltool
 Standards-Version: 3.9.3
 Homepage: http://code.googlecode.com/p/fcitx
 Vcs-Git: git://git.debian.org/pkg-ime/fcitx-table-extra.git
@@ -155,6 +155,22 @@
  .
  This package provides Wubi-Large table used by the Fcitx table engine.
 
+Package: fcitx-table-zhengma-large
+Architecture: any
+Depends: ${misc:Depends}, fcitx-table
+Description: Flexible Input Method Framework - Zhengma-Large table
+ Fcitx is a input method framework with extension support, which provides
+ an interface for entering characters of different scripts in applications
+ using a variety of mapping systems. 
+ .
+ It offers a pleasant and modern experience, with intuitive graphical
+ configuration tools and customizable skins and mapping tables. It is
+ highly modularized and extensible, with GTK+ 2/3 and Qt4 IM Modules, support
+ for UIs based on Fbterm, pure Xlib, GTK+, or KDE, and a developer-friendly
+ API.
+ .
+ This package provides Zhengma-Large table used by the Fcitx table engine.
+
 Package: fcitx-table-easy-big
 Architecture: any
 Depends: ${misc:Depends}, fcitx-table
diff --git a/debian/fcitx-table-zhengma-large.install b/debian/fcitx-table-zhengma-large.install
new file mode 100644
index 0000000..b3d9c08
--- /dev/null
+++ b/debian/fcitx-table-zhengma-large.install
@@ -0,0 +1,2 @@
+usr/share/fcitx/table/zhengma-large.mb
+usr/share/fcitx/table/zhengma-large.conf
diff --git a/po/fcitx-table-extra.pot b/po/fcitx-table-extra.pot
index db47091..551ed10 100644
--- a/po/fcitx-table-extra.pot
+++ b/po/fcitx-table-extra.pot
@@ -88,10 +88,7 @@
 #: /home/saber/Develop/fcitx-table-extra/build/po/tmp/wubi-large.conf.in.h:1
 msgid "Wubi (Large)"
 msgstr ""
-<<<<<<< HEAD
-=======
 
 #: /home/saber/Develop/fcitx-table-extra/build/po/tmp/zhengma-large.conf.in.h:1
 msgid "Zhengma (Large)"
 msgstr ""
->>>>>>> upstream/0.3.2