diff --git a/ibus.spec b/ibus.spec
index 15a20f6..f0efc51 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -13,7 +13,7 @@
 
 Name:       ibus
 Version:    1.3.99.20110419
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -24,6 +24,7 @@ Source1:    xinput-ibus
 Source2:    http://fujiwara.fedorapeople.org/ibus/gnome-shell/gnome-shell-ibus-plugins-20110601.tar.bz2
 %endif
 Source3:    https://www.transifex.net/projects/p/ibus/resource/master/l/da/download/ibus_master_da.po
+Source4:    http://ueno.fedorapeople.org/ibus-indicator/ibus-indicator.tar.bz2
 Patch0:     ibus-HEAD.patch
 Patch1:     ibus-435880-surrounding-text.patch
 Patch2:     ibus-541492-xkb.patch
@@ -121,6 +122,21 @@ Requires(post): glib2 >= %{glib_ver}
 %description gtk3
 This package contains ibus im module for gtk3
 
+%package gnome3
+Summary:    IBus gnome-shell-extension for GNOME3
+Group:      System Environment/Libraries
+Requires:   %{name} = %{version}-%{release}
+Requires:   %{name}-libs = %{version}-%{release}
+Requires:   gnome-shell
+
+%description gnome3
+This is a transitional package which allows users to try out new IBus
+GUI for GNOME3 in development.  Note that this package will be marked
+as obsolete once the integration has completed in the GNOME3 upstream.
+
+%description gtk3
+This package contains ibus im module for gtk3
+
 %package devel
 Summary:    Development tools for ibus
 Group:      Development/Libraries
@@ -150,6 +166,7 @@ sed -i \
   -e "s|Config.IBUS_XKB|'/usr/libexec/ibus-xkb'|" \
   -e "s|Config.HAVE_IBUS_XKB|true|" \
   js/ui/status/ibus/xkbLayout.js
+bzcat %SOURCE4 | tar xf -
 %endif
 cp %SOURCE3 po/da.po
 %patch0 -p1
@@ -215,19 +232,10 @@ desktop-file-install --delete-original          \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
 %if %have_gjsfile
-cp -R js/ui/status/ibus $RPM_BUILD_ROOT%{_datadir}/ibus/ui/gjs-g-s
-cat >> $RPM_BUILD_ROOT%{_datadir}/ibus/ui/gjs-g-s/README <<_EOF
-IBus Panel for GNOME-Shell
---------------------------
-
-This is an alpha version of IBus Panel for GNOME-Shell.
-These files under this directory are prepared for the test purpose.
-It is planned to integrate the files into gnome-shell finally.
-Please refer the installation:
-https://fedoraproject.org/wiki/I18N/InputMethods#GNOME-Shell
-Bug Report:
-https://bugzilla.redhat.com/show_bug.cgi?id=657165
-_EOF
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/gnome-shell
+cp -R js $RPM_BUILD_ROOT%{_datadir}/gnome-shell
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/gnome-shell/extensions
+cp -R ibus-indicator@example.com $RPM_BUILD_ROOT%{_datadir}/gnome-shell/extensions
 %endif
 
 # FIXME: no version number
@@ -323,6 +331,11 @@ fi
 %defattr(-,root,root,-)
 %{_libdir}/gtk-3.0/%{gtk3_binary_version}/immodules/im-ibus.so
 
+%files gnome3
+%defattr(-,root,root,-)
+%{_datadir}/gnome-shell/js/ui/status/ibus
+%{_datadir}/gnome-shell/extensions/ibus-indicator@example.com
+
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
@@ -337,6 +350,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Jun  9 2011 Daiki Ueno <dueno@redhat.com> - 1.3.99.20110419-3
+- Added transitional ibus-gnome3 package.
+
 * Wed Jun 08 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110419-2
 - Added ibus-711632-fedora-fallback-icon.patch
   Fixed SEGV with no icon in oxygen-gtk icon theme.