diff --git a/packaging/changedate.py b/packaging/changedate.py
new file mode 100755
index 0000000000..cff51a0a4f
--- /dev/null
+++ b/packaging/changedate.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+import os
+
+if __name__ == '__main__':
+  for dirpath, dirs, files in os.walk(".", topdown=False):
+    for name in files:
+      try:
+        os.utime(os.path.join(dirpath, name),(1260572400, 1260572400))
+      except Exception:
+        pass
+
diff --git a/packaging/crosswalk-bin.spec b/packaging/crosswalk-bin.spec
new file mode 100644
index 0000000000..d10d63b2da
--- /dev/null
+++ b/packaging/crosswalk-bin.spec
@@ -0,0 +1,330 @@
+%bcond_with x
+%bcond_with wayland
+
+%ifarch x86_64 %{arm}
+### x86_64
+# NaCl build on 64bit system require libc 32bit to build the 32 IRT.
+# While Tizen 64bit image does not offer 32bit packages at all,
+# check https://bugs.tizen.org/jira/browse/PTREL-803 for details.
+# So disable nacl for 64bit now.
+### ARM
+# Due to OBS build for ARM some files needed by NaCl to be build
+# are not present.
+%define _disable_nacl 1
+%else
+# Since M39, Google has stopped shipping a 32-bit PNaCl toolchain, so we cannot
+# build NaCl on a fully 32-bit host anymore. See XWALK-2679.
+%define _disable_nacl 1
+%endif
+
+# adjust compression algorithm to speed up RPMS creation
+# source RPM and debug RPMS are big and take too much time
+# when using standard (lzma) compression
+%define _source_payload w3.gzdio
+%define _binary_payload w3.gzdio
+
+Name:           crosswalk
+Version:        11.39.237.0
+Release:        0
+Summary:        Chromium-based app runtime
+License:        (BSD-3-Clause and LGPL-2.1+)
+Group:          Web Framework/Web Run Time
+Url:            https://github.com/otcshare/crosswalk
+Source:         %{name}.tar
+Source1:        xwalk.in
+Source2:        org.crosswalkproject.Runtime1.service
+Source3:        xwalk.service.in
+Source1001:     crosswalk.manifest
+Source1002:     %{name}.xml.in
+Source1003:     %{name}.png
+Source1004:		changedate.py
+Patch9:         Blink-Add-GCC-flag-Wno-narrowing-fix-64bits-build.patch
+Patch10:        crosswalk-do-not-look-for-gtk-dependencies-on-x11.patch
+
+BuildRequires:  bison
+BuildRequires:  bzip2-devel
+BuildRequires:  elfutils
+BuildRequires:  expat-devel
+BuildRequires:  flex
+BuildRequires:  gperf
+BuildRequires:  libcap-devel
+BuildRequires:  libelf-devel
+BuildRequires:  ninja
+BuildRequires:  python
+BuildRequires:  python-xml
+BuildRequires:  perl
+BuildRequires:  which
+BuildRequires:  pkgconfig(ail)
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(appcore-common)
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(capi-location-manager)
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(gles20)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(haptic)
+BuildRequires:  pkgconfig(icu-i18n)
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(libexif)
+BuildRequires:  pkgconfig(libpci)
+BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(libtzplatform-config)
+BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libxslt)
+BuildRequires:  pkgconfig(pango)
+BuildRequires:  pkgconfig(pkgmgr)
+BuildRequires:  pkgconfig(pkgmgr-info)
+BuildRequires:  pkgconfig(pkgmgr-installer)
+BuildRequires:  pkgconfig(pkgmgr-parser)
+BuildRequires:  pkgconfig(secure-storage)
+BuildRequires:  pkgconfig(sensor)
+BuildRequires:  pkgconfig(nspr)
+BuildRequires:  pkgconfig(nss)
+BuildRequires:  pkgconfig(vconf)
+BuildRequires:  pkgconfig(xmlsec1)
+%if %{with x}
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xcomposite)
+BuildRequires:  pkgconfig(xcursor)
+BuildRequires:  pkgconfig(xdamage)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xfixes)
+BuildRequires:  pkgconfig(xi)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(xrender)
+BuildRequires:  pkgconfig(xscrnsaver)
+BuildRequires:  pkgconfig(xt)
+BuildRequires:  pkgconfig(xtst)
+%endif
+
+%if "%{profile}" == "ivi"
+BuildRequires:  pkgconfig(murphy-common)
+BuildRequires:  pkgconfig(murphy-resource)
+%endif
+
+%if %{with wayland}
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(wayland-cursor)
+BuildRequires:  pkgconfig(wayland-egl)
+BuildRequires:  pkgconfig(xkbcommon)
+%else
+BuildRequires:  pkgconfig(scim)
+%endif
+Requires:  ca-certificates-tizen
+Requires:  ss-server
+BuildRequires:  crosswalk-thirdparty
+
+%description
+Crosswalk is an app runtime based on Chromium. It is an open source project started by the Intel Open Source Technology Center (http://www.01.org).
+
+%define _manifestdir %TZ_SYS_RO_PACKAGES
+%define _manifestdir_ro %TZ_SYS_RO_PACKAGE
+%define _desktop_icondir %TZ_SYS_RW_ICONS/default/small
+%define _desktop_icondir_ro %TZ_SYS_RO_ICONS/default/small
+%define _dbusservicedir /usr/share/dbus-1/services
+%define _systemduserservicedir /usr/lib/systemd/user
+
+%prep
+%setup -q -n crosswalk
+
+cp %{SOURCE1} .
+cp %{SOURCE3} .
+cp %{SOURCE1001} .
+cp %{SOURCE1002} .
+cp %{SOURCE1003} .
+cp %{SOURCE1004} .
+sed "s/@VERSION@/%{version}/g" %{name}.xml.in > %{name}.xml
+sed "s|@LIB_INSTALL_DIR@|%{_libdir}|g" xwalk.in > xwalk
+sed "s|@LIB_INSTALL_DIR@|%{_libdir}|g" xwalk.service.in > xwalk.service
+
+cp -a src/AUTHORS AUTHORS.chromium
+cp -a src/LICENSE LICENSE.chromium
+cp -a src/xwalk/LICENSE LICENSE.xwalk
+
+%patch9
+
+# The profiles using Wayland (and thus Ozone) do not need this patch.
+%if !%{with wayland}
+%patch10
+%endif
+
+%build
+
+mkdir -p src/out
+if [ -f %{_datadir}/crosswalk-thirdparty/out.tgz ]; then
+  tar -zxvf %{_datadir}/crosswalk-thirdparty/out.tgz
+fi
+python ./changedate.py
+
+# Stop unconditionally passing -Wall to the compiler. Chromium has its own
+# mechanisms for deciding which parts of the code need -Wall and which need it
+# to be left out (since several pieces are built with -Werror). At least in
+# M39, this is preventing the "rtc_base" target from being built because it
+# does not expect -Wall to be passed to the compiler (see webrtc issue 3307).
+export CXXFLAGS=`echo $CXXFLAGS | sed s,-Wall,,g`
+
+# For ffmpeg on ia32. The original CFLAGS set by the gyp and config files in
+# src/third_party/ffmpeg already pass -O2 -fomit-frame-pointer, but Tizen's
+# CFLAGS end up appending -fno-omit-frame-pointer. See http://crbug.com/37246
+export CFLAGS=`echo $CFLAGS | sed s,-fno-omit-frame-pointer,,g`
+
+%if ! %{_disable_nacl}
+# For nacl_bootstrap on ia32. The original CFLAGS set by the gyp
+# native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp already ignored 
+# -fstack-protector and -funwind-tables, but Tizen's CFLAGS end up appending them, thus
+# causing linking failures. Check XWALK-1689 for details.
+export CFLAGS=`echo $CFLAGS | sed s,-fstack-protector,,g`
+export CFLAGS=`echo $CFLAGS | sed s,-funwind-tables,,g`
+%endif
+
+# Building the RPM in the GBS chroot fails with errors such as
+#   /usr/lib/gcc/i586-tizen-linux/4.7/../../../../i586-tizen-linux/bin/ld:
+#       failed to set dynamic section sizes: Memory exhausted
+# For now, work around it by passing a GNU ld-specific flag that optimizes the
+# linker for memory usage.
+export LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+# Support building in a non-standard directory, possibly outside %{_builddir}.
+# Since the build root is erased every time a new build is performed, one way
+# to avoid losing the build directory is to specify a location outside the
+# build root to the BUILDDIR_NAME definition, such as "/var/tmp/xwalk-build"
+# (remember all paths are still inside the chroot):
+#    gbs build --define 'BUILDDIR_NAME /some/path'
+BUILDDIR_NAME="%{?BUILDDIR_NAME}"
+if [ -n "${BUILDDIR_NAME}" ]; then
+   mkdir -p "${BUILDDIR_NAME}"
+   ln -s "${BUILDDIR_NAME}" src/out
+fi
+
+%if %{with wayland}
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1"
+%endif
+
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=%{_disable_nacl}"
+
+# Linking fails in Tizen Common when fatal ld warnings are enabled. XWALK-1379.
+%if "%{profile}" == "common" || "%{profile}" == "generic"
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_fatal_linker_warnings=1"
+%endif
+
+# For building for arm in OBS, we need :
+# -> to unset sysroot value.
+# sysroot variable is automatically set for cross compilation to use arm-sysroot provided by Chromium project
+# -> to force system ld binary.
+# Indeed the build is made on Emulated / Virtualized environment that correspond
+# to the target.
+# gold ld used is avaible only for 32/64 bits Intel Arch.
+# sysroot usage is not needed, we need to use arm libraries from the virtualized environment.
+#
+# Crosswalk build fails if the fpu selected in the gcc option is different from neon in case of arm7 compilation
+# So force it.
+%ifarch %{arm}
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Dsysroot= -Dlinux_use_gold_binary=0"
+export CFLAGS=`echo $CFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g`
+export CXXFLAGS=`echo $CXXFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g`
+export FFLAGS=`echo $FFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g`
+%endif
+
+%if "%{profile}" == "ivi"
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Denable_murphy=1"
+%endif
+
+# --no-parallel is added because chroot does not mount a /dev/shm, this will
+# cause python multiprocessing.SemLock error.
+export GYP_GENERATORS='ninja'
+./src/xwalk/gyp_xwalk src/xwalk/xwalk.gyp \
+--no-parallel \
+${GYP_EXTRA_FLAGS} \
+-Dchromeos=0 \
+-Dclang=0 \
+-Dtizen=1 \
+-Dpython_ver=2.7 \
+-Duse_aura=1 \
+-Duse_cups=0 \
+-Duse_gconf=0 \
+-Duse_gnome_keyring=0 \
+-Duse_kerberos=0 \
+-Duse_system_bzip2=1 \
+-Duse_system_libexif=1 \
+-Duse_system_libxml=1 \
+-Duse_system_nspr=1 \
+-Dshared_process_mode=1 \
+-Denable_hidpi=1
+
+ninja %{?_smp_mflags} -C src/out/Release xwalk xwalk_launcher xwalk_application_tools
+
+%install
+# Binaries.
+install -p -D %{SOURCE2} %{buildroot}%{_dbusservicedir}/org.crosswalkproject.Runtime1.service
+install -p -D xwalk.service %{buildroot}%{_systemduserservicedir}/xwalk.service
+install -p -D src/out/Release/xwalk %{buildroot}%{_libdir}/xwalk/xwalk
+install -p -D src/out/Release/xwalkctl %{buildroot}%{_bindir}/xwalkctl
+install -p -D src/out/Release/xwalk-launcher %{buildroot}%{_bindir}/xwalk-launcher
+install -p -D src/out/Release/xwalk_backend %{buildroot}%{_libdir}/xwalk/xwalk_backend
+install -p -D src/out/Release/lib/libxwalk_backend_lib.so %{buildroot}%{_libdir}/xwalk/libxwalk_backend_lib.so
+
+# Supporting libraries and resources.
+install -p -D src/out/Release/icudtl.dat %{buildroot}%{_libdir}/xwalk/icudtl.dat
+install -p -D src/out/Release/libffmpegsumo.so %{buildroot}%{_libdir}/xwalk/libffmpegsumo.so
+install -p -D src/out/Release/xwalk.pak %{buildroot}%{_libdir}/xwalk/xwalk.pak
+mkdir -p %{buildroot}%{_datadir}/xwalk
+install -p -D src/xwalk/application/common/tizen/configuration/*.xsd %{buildroot}%{_datadir}/xwalk/
+
+# PNaCl
+%if ! %{_disable_nacl}
+install -p -D src/out/Release/nacl_bootstrap_raw %{buildroot}%{_libdir}/xwalk/nacl_bootstrap_raw
+install -p -D src/out/Release/nacl_helper %{buildroot}%{_libdir}/xwalk/nacl_helper
+install -p -D src/out/Release/nacl_helper_bootstrap %{buildroot}%{_libdir}/xwalk/nacl_helper_bootstrap
+install -p -D src/out/Release/nacl_irt_*.nexe %{buildroot}%{_libdir}/xwalk
+install -p -d %{buildroot}%{_libdir}/xwalk/pnacl
+install -m 0664 -p -D src/out/Release/pnacl/* %{buildroot}%{_libdir}/xwalk/pnacl
+%endif
+
+# Register xwalk to the package manager.
+install -p -D %{name}.xml %{buildroot}%{_manifestdir}/%{name}.xml
+install -p -D %{name}.png %{buildroot}%{_desktop_icondir}/%{name}.png
+
+%post
+mkdir -p %{_desktop_icondir_ro}
+mkdir -p %{_manifestdir_ro}
+
+ln -sf %{_libdir}/xwalk/libxwalk_backend_lib.so /etc/package-manager/backendlib/libxpk.so
+ln -sf %{_libdir}/xwalk/libxwalk_backend_lib.so /etc/package-manager/backendlib/libwgt.so
+ln -sf %{_libdir}/xwalk/xwalk_backend /etc/package-manager/backend/xpk
+ln -sf %{_libdir}/xwalk/xwalk_backend /etc/package-manager/backend/wgt
+
+%preun
+if [ $1 -eq 0 ] ; then
+ # don't remove if we are upgrade the rpm package
+[ -L /etc/package-manager/backendlib/libxpk.so ] && rm /etc/package-manager/backendlib/libxpk.so
+[ -L /etc/package-manager/backendlib/libwgt.so ] && rm /etc/package-manager/backendlib/libwgt.so
+[ -L /etc/package-manager/backend/xpk ] && rm /etc/package-manager/backend/xpk
+[ -L /etc/package-manager/backend/wgt ] && rm /etc/package-manager/backend/wgt
+fi
+
+%files
+%manifest %{name}.manifest
+%license AUTHORS.chromium LICENSE.chromium LICENSE.xwalk
+%{_bindir}/xwalkctl
+%{_bindir}/xwalk-launcher
+%{_libdir}/xwalk/icudtl.dat
+%{_libdir}/xwalk/libffmpegsumo.so
+%if ! %{_disable_nacl}
+%{_libdir}/xwalk/nacl_bootstrap_raw
+%{_libdir}/xwalk/nacl_helper
+%{_libdir}/xwalk/nacl_helper_bootstrap
+%{_libdir}/xwalk/nacl_irt_*.nexe
+%{_libdir}/xwalk/pnacl/*
+%endif
+%{_libdir}/xwalk/xwalk
+%{_libdir}/xwalk/xwalk.pak
+%{_libdir}/xwalk/libxwalk_backend_lib.so
+%{_libdir}/xwalk/xwalk_backend
+%{_manifestdir}/%{name}.xml
+%{_desktop_icondir}/%{name}.png
+%{_dbusservicedir}/org.crosswalkproject.Runtime1.service
+%{_systemduserservicedir}/xwalk.service
+%{_datadir}/xwalk/*
diff --git a/packaging/crosswalk-thirdparty.manifest b/packaging/crosswalk-thirdparty.manifest
new file mode 100644
index 0000000000..017d22d3af
--- /dev/null
+++ b/packaging/crosswalk-thirdparty.manifest
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+    <domain name="_"/>
+ </request>
+</manifest>
diff --git a/packaging/crosswalk.spec b/packaging/crosswalk.spec
index 517101ba16..387d0fb9f5 100644
--- a/packaging/crosswalk.spec
+++ b/packaging/crosswalk.spec
@@ -1,6 +1,9 @@
 %bcond_with x
 %bcond_with wayland
 
+%define debug_package %{nil}
+%define __debug_install_post %{nil}
+
 %ifarch x86_64 %{arm}
 ### x86_64
 # NaCl build on 64bit system require libc 32bit to build the 32 IRT.
@@ -23,22 +26,19 @@
 %define _source_payload w3.gzdio
 %define _binary_payload w3.gzdio
 
-Name:           crosswalk
+Name:           crosswalk-thirdparty
 Version:        11.39.237.0
 Release:        0
 Summary:        Chromium-based app runtime
 License:        (BSD-3-Clause and LGPL-2.1+)
 Group:          Web Framework/Web Run Time
 Url:            https://github.com/otcshare/crosswalk
-Source:         %{name}.tar
-Source1:        xwalk.in
-Source2:        org.crosswalkproject.Runtime1.service
-Source3:        xwalk.service.in
-Source1001:     crosswalk.manifest
-Source1002:     %{name}.xml.in
-Source1003:     %{name}.png
+Source:         crosswalk.tar
+Source1001:     crosswalk-thirdparty.manifest
+Source1002:     xwalk-thirdparty.gyp
 Patch9:         Blink-Add-GCC-flag-Wno-narrowing-fix-64bits-build.patch
 Patch10:        crosswalk-do-not-look-for-gtk-dependencies-on-x11.patch
+NoSource:       0
 
 BuildRequires:  bison
 BuildRequires:  bzip2-devel
@@ -53,37 +53,18 @@ BuildRequires:  python
 BuildRequires:  python-xml
 BuildRequires:  perl
 BuildRequires:  which
-BuildRequires:  pkgconfig(ail)
 BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(appcore-common)
 BuildRequires:  pkgconfig(cairo)
-BuildRequires:  pkgconfig(capi-location-manager)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(fontconfig)
-BuildRequires:  pkgconfig(freetype2)
-BuildRequires:  pkgconfig(gles20)
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(haptic)
-BuildRequires:  pkgconfig(icu-i18n)
-BuildRequires:  pkgconfig(libdrm)
-BuildRequires:  pkgconfig(libexif)
 BuildRequires:  pkgconfig(libpci)
 BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(pango)
-BuildRequires:  pkgconfig(pkgmgr)
-BuildRequires:  pkgconfig(pkgmgr-info)
-BuildRequires:  pkgconfig(pkgmgr-installer)
-BuildRequires:  pkgconfig(pkgmgr-parser)
-BuildRequires:  pkgconfig(secure-storage)
-BuildRequires:  pkgconfig(sensor)
-BuildRequires:  pkgconfig(nspr)
 BuildRequires:  pkgconfig(nss)
-BuildRequires:  pkgconfig(vconf)
-BuildRequires:  pkgconfig(xmlsec1)
 %if %{with x}
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xcomposite)
@@ -114,32 +95,21 @@ BuildRequires:  pkgconfig(scim)
 %endif
 Requires:  ca-certificates-tizen
 Requires:  ss-server
+AutoProv:       0
+Provides:       crosswalk-thirdparty
 
 %description
-Crosswalk is an app runtime based on Chromium. It is an open source project started by the Intel Open Source Technology Center (http://www.01.org).
+libraries and binaries of crosswalk project  
 
-%define _manifestdir %TZ_SYS_RO_PACKAGES
-%define _manifestdir_ro %TZ_SYS_RO_PACKAGE
-%define _desktop_icondir %TZ_SYS_RW_ICONS/default/small
-%define _desktop_icondir_ro %TZ_SYS_RO_ICONS/default/small
 %define _dbusservicedir /usr/share/dbus-1/services
 %define _systemduserservicedir /usr/lib/systemd/user
 
 %prep
 %setup -q -n crosswalk
 
-cp %{SOURCE1} .
-cp %{SOURCE3} .
 cp %{SOURCE1001} .
-cp %{SOURCE1002} .
-cp %{SOURCE1003} .
-sed "s/@VERSION@/%{version}/g" %{name}.xml.in > %{name}.xml
-sed "s|@LIB_INSTALL_DIR@|%{_libdir}|g" xwalk.in > xwalk
-sed "s|@LIB_INSTALL_DIR@|%{_libdir}|g" xwalk.service.in > xwalk.service
+cp %{SOURCE1002} src/xwalk/
 
-cp -a src/AUTHORS AUTHORS.chromium
-cp -a src/LICENSE LICENSE.chromium
-cp -a src/xwalk/LICENSE LICENSE.xwalk
 
 %patch9
 
@@ -226,7 +196,7 @@ GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Denable_murphy=1"
 # --no-parallel is added because chroot does not mount a /dev/shm, this will
 # cause python multiprocessing.SemLock error.
 export GYP_GENERATORS='ninja'
-./src/xwalk/gyp_xwalk src/xwalk/xwalk.gyp \
+./src/xwalk/gyp_xwalk src/xwalk/xwalk-thirdparty.gyp \
 --no-parallel \
 ${GYP_EXTRA_FLAGS} \
 -Dchromeos=0 \
@@ -245,77 +215,15 @@ ${GYP_EXTRA_FLAGS} \
 -Dshared_process_mode=1 \
 -Denable_hidpi=1
 
-ninja %{?_smp_mflags} -C src/out/Release xwalk xwalk_launcher xwalk_application_tools
+ninja %{?_smp_mflags} -C src/out/Release xwalk-thirdparty
 
 %install
-# Binaries.
-install -p -D %{SOURCE2} %{buildroot}%{_dbusservicedir}/org.crosswalkproject.Runtime1.service
-install -p -D xwalk.service %{buildroot}%{_systemduserservicedir}/xwalk.service
-install -p -D src/out/Release/xwalk %{buildroot}%{_libdir}/xwalk/xwalk
-install -p -D src/out/Release/xwalkctl %{buildroot}%{_bindir}/xwalkctl
-install -p -D src/out/Release/xwalk-launcher %{buildroot}%{_bindir}/xwalk-launcher
-install -p -D src/out/Release/xwalk_backend %{buildroot}%{_libdir}/xwalk/xwalk_backend
-install -p -D src/out/Release/lib/libxwalk_backend_lib.so %{buildroot}%{_libdir}/xwalk/libxwalk_backend_lib.so
-
-# Supporting libraries and resources.
-install -p -D src/out/Release/icudtl.dat %{buildroot}%{_libdir}/xwalk/icudtl.dat
-install -p -D src/out/Release/libffmpegsumo.so %{buildroot}%{_libdir}/xwalk/libffmpegsumo.so
-install -p -D src/out/Release/xwalk.pak %{buildroot}%{_libdir}/xwalk/xwalk.pak
-mkdir -p %{buildroot}%{_datadir}/xwalk
-install -p -D src/xwalk/application/common/tizen/configuration/*.xsd %{buildroot}%{_datadir}/xwalk/
-
-# PNaCl
-%if ! %{_disable_nacl}
-install -p -D src/out/Release/nacl_bootstrap_raw %{buildroot}%{_libdir}/xwalk/nacl_bootstrap_raw
-install -p -D src/out/Release/nacl_helper %{buildroot}%{_libdir}/xwalk/nacl_helper
-install -p -D src/out/Release/nacl_helper_bootstrap %{buildroot}%{_libdir}/xwalk/nacl_helper_bootstrap
-install -p -D src/out/Release/nacl_irt_*.nexe %{buildroot}%{_libdir}/xwalk
-install -p -d %{buildroot}%{_libdir}/xwalk/pnacl
-install -m 0664 -p -D src/out/Release/pnacl/* %{buildroot}%{_libdir}/xwalk/pnacl
-%endif
-
-# Register xwalk to the package manager.
-install -p -D %{name}.xml %{buildroot}%{_manifestdir}/%{name}.xml
-install -p -D %{name}.png %{buildroot}%{_desktop_icondir}/%{name}.png
 
-%post
-mkdir -p %{_desktop_icondir_ro}
-mkdir -p %{_manifestdir_ro}
-
-ln -sf %{_libdir}/xwalk/libxwalk_backend_lib.so /etc/package-manager/backendlib/libxpk.so
-ln -sf %{_libdir}/xwalk/libxwalk_backend_lib.so /etc/package-manager/backendlib/libwgt.so
-ln -sf %{_libdir}/xwalk/xwalk_backend /etc/package-manager/backend/xpk
-ln -sf %{_libdir}/xwalk/xwalk_backend /etc/package-manager/backend/wgt
-
-%preun
-if [ $1 -eq 0 ] ; then
- # don't remove if we are upgrade the rpm package
-[ -L /etc/package-manager/backendlib/libxpk.so ] && rm /etc/package-manager/backendlib/libxpk.so
-[ -L /etc/package-manager/backendlib/libwgt.so ] && rm /etc/package-manager/backendlib/libwgt.so
-[ -L /etc/package-manager/backend/xpk ] && rm /etc/package-manager/backend/xpk
-[ -L /etc/package-manager/backend/wgt ] && rm /etc/package-manager/backend/wgt
-fi
+mkdir  -p %{buildroot}/%{_datadir}/crosswalk-thirdparty/
+tar -zcvf out.tgz src/out
+cp -ar out.tgz %{buildroot}/%{_datadir}/crosswalk-thirdparty/
 
 %files
 %manifest %{name}.manifest
-%license AUTHORS.chromium LICENSE.chromium LICENSE.xwalk
-%{_bindir}/xwalkctl
-%{_bindir}/xwalk-launcher
-%{_libdir}/xwalk/icudtl.dat
-%{_libdir}/xwalk/libffmpegsumo.so
-%if ! %{_disable_nacl}
-%{_libdir}/xwalk/nacl_bootstrap_raw
-%{_libdir}/xwalk/nacl_helper
-%{_libdir}/xwalk/nacl_helper_bootstrap
-%{_libdir}/xwalk/nacl_irt_*.nexe
-%{_libdir}/xwalk/pnacl/*
-%endif
-%{_libdir}/xwalk/xwalk
-%{_libdir}/xwalk/xwalk.pak
-%{_libdir}/xwalk/libxwalk_backend_lib.so
-%{_libdir}/xwalk/xwalk_backend
-%{_manifestdir}/%{name}.xml
-%{_desktop_icondir}/%{name}.png
-%{_dbusservicedir}/org.crosswalkproject.Runtime1.service
-%{_systemduserservicedir}/xwalk.service
-%{_datadir}/xwalk/*
+%{_datadir}/crosswalk-thirdparty/*
+
diff --git a/packaging/xwalk-thirdparty.gyp b/packaging/xwalk-thirdparty.gyp
new file mode 100644
index 0000000000..184ad089f3
--- /dev/null
+++ b/packaging/xwalk-thirdparty.gyp
@@ -0,0 +1,394 @@
+{
+  'variables': {
+    'xwalk_product_name': 'XWalk',
+    'xwalk_version': '<!(python ../build/util/version.py -f VERSION -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")',
+    'chrome_version': '<!(python ../build/util/version.py -f ../chrome/VERSION -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")',
+    'conditions': [
+      ['OS=="linux"', {
+       'use_custom_freetype%': 1,
+      }, {
+       'use_custom_freetype%': 0,
+      }],
+      ['OS=="win" or OS=="mac"', {
+        'disable_nacl': 1,
+      }],
+    ], # conditions
+  },
+  'targets': [
+    {
+      'target_name': 'xwalk_runtime',
+      'type': 'static_library',
+      'defines!': ['CONTENT_IMPLEMENTATION'],
+      'defines': ['XWALK_VERSION="<(xwalk_version)"','CHROME_VERSION="<(chrome_version)"'],
+      'variables': {
+        'chromium_code': 1,
+      },
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../base/base.gyp:base_i18n',
+        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../cc/cc.gyp:cc',
+        '../components/components.gyp:visitedlink_browser',
+        '../components/components.gyp:visitedlink_renderer',
+        '../content/content.gyp:content',
+        '../content/content.gyp:content_app_both',
+        '../content/content.gyp:content_browser',
+        '../content/content.gyp:content_common',
+        '../content/content.gyp:content_gpu',
+        '../content/content.gyp:content_plugin',
+        '../content/content.gyp:content_ppapi_plugin',
+        '../content/content.gyp:content_renderer',
+        '../content/content.gyp:content_utility',
+        '../ipc/ipc.gyp:ipc',
+        '../media/media.gyp:media',
+        '../net/net.gyp:net',
+        '../net/net.gyp:net_resources',
+        '../skia/skia.gyp:skia',
+        '../storage/storage_browser.gyp:storage',
+        '../storage/storage_common.gyp:storage_common',
+        '../third_party/WebKit/public/blink.gyp:blink',
+        '../ui/base/ui_base.gyp:ui_base',
+        '../ui/gl/gl.gyp:gl',
+        '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
+        '../url/url.gyp:url_lib',
+        '../v8/tools/gyp/v8.gyp:v8',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'msvs_settings': {
+        'VCLinkerTool': {
+          'SubSystem': '2',  # Set /SUBSYSTEM:WINDOWS
+        },
+      },
+      'conditions': [
+        ['tizen==1', {
+          'dependencies': [
+            '../content/app/resources/content_resources.gyp:content_resources',
+            '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
+            '../components/components.gyp:web_modal',
+            '../components/components.gyp:renderer_context_menu',
+          ],
+        }],
+        ['os_posix==1 and OS != "mac" and use_allocator=="tcmalloc"', {
+          'dependencies': [
+            # This is needed by content/app/content_main_runner.cc
+            '../base/allocator/allocator.gyp:allocator',
+          ],
+        }],  # os_posix==1 and OS != "mac" and use_allocator=="tcmalloc"
+        ['use_custom_freetype==1', {
+          'dependencies': [
+             '../third_party/freetype2/freetype2.gyp:freetype2',
+          ],
+        }],  # use_custom_freetype==1
+        ['toolkit_views==1', {
+          'dependencies': [
+            '../ui/strings/ui_strings.gyp:ui_strings',
+            '../ui/views/controls/webview/webview.gyp:webview',
+            '../ui/views/views.gyp:views',
+            '../ui/views/views.gyp:views_test_support',
+            '../ui/resources/ui_resources.gyp:ui_resources',
+          ],
+        }],  # toolkit_views==1
+        ['use_aura==1', {
+          'dependencies': [
+            '../ui/aura/aura.gyp:aura',
+          ],
+        }, {  # use_aura==0
+          'sources/': [
+            ['exclude', '_aura\\.cc$'],
+          ],
+        }],
+        ['disable_nacl==0', {
+            'conditions': [
+                ['OS=="linux"', {
+                  'sources': [
+                    'runtime/browser/nacl_host/nacl_browser_delegate_impl.cc',
+                    'runtime/browser/nacl_host/nacl_browser_delegate_impl.h',
+                  ],
+                  'dependencies': [
+                    '../components/nacl.gyp:nacl',
+                    '../components/nacl.gyp:nacl_browser',
+                    '../components/nacl.gyp:nacl_common',
+                    '../components/nacl.gyp:nacl_renderer',
+                    '../components/nacl.gyp:nacl_helper',
+                    '../components/nacl.gyp:nacl_linux',
+                    '../native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp:nacl_helper_bootstrap',
+                    '../ppapi/native_client/src/trusted/plugin/plugin.gyp:nacl_trusted_plugin',
+                  ],
+                }],
+            ],
+        }],
+        ['enable_plugins==1', {
+          'dependencies': [
+            '../ppapi/ppapi_internal.gyp:ppapi_host',
+            '../ppapi/ppapi_internal.gyp:ppapi_proxy',
+            '../ppapi/ppapi_internal.gyp:ppapi_ipc',
+            '../ppapi/ppapi_internal.gyp:ppapi_shared',
+          ],
+        }, {  # enable_plugins==0
+          'sources/': [
+            ['exclude', '^runtime/browser/renderer_host/pepper/'],
+            ['exclude', '^runtime/renderer/pepper/'],
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'xwalk_resources',
+      'type': 'none',
+      'dependencies': [
+        'generate_xwalk_resources',
+      ],
+      'variables': {
+        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/xwalk',
+      },
+      'includes': [ '../build/grit_target.gypi' ],
+      'copies': [
+        {
+          'destination': '<(PRODUCT_DIR)',
+          'files': [
+            '<(SHARED_INTERMEDIATE_DIR)/xwalk/xwalk_resources.pak'
+          ],
+        },
+      ],
+    },
+    {
+      'target_name': 'generate_xwalk_resources',
+      'type': 'none',
+      'variables': {
+        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/xwalk',
+      },
+      'actions': [
+        {
+          'action_name': 'xwalk_resources',
+          'variables': {
+            'grit_resource_ids': 'resources/resource_ids',
+            'grit_grd_file': 'runtime/resources/xwalk_resources.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+      ],
+    },
+    {
+      # Build a minimal set of resources so Blink in XWalk has
+      # access to necessary resources.
+      'target_name': 'xwalk_pak',
+      'type': 'none',
+      'dependencies': [
+        '<(DEPTH)/ui/strings/ui_strings.gyp:ui_strings',
+        '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
+        '<(DEPTH)/content/app/resources/content_resources.gyp:content_resources',
+      ],
+      'conditions': [
+        [ 'OS!="android"', {
+          'dependencies': [
+            '<(DEPTH)/content/browser/devtools/devtools_resources.gyp:devtools_resources',
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'xwalk-thirdparty',
+      'type': 'none',
+      'mac_bundle': 1,
+      'defines!': ['CONTENT_IMPLEMENTATION'],
+      'dependencies': [
+        'xwalk_runtime',
+        'xwalk_pak',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'mac_bundle_resources': [
+        'runtime/app/app.icns',
+        'runtime/app/app-Info.plist',
+      ],
+      # TODO(mark): Come up with a fancier way to do this.  It should only
+      # be necessary to list app-Info.plist once, not the three times it is
+      # listed here.
+      'mac_bundle_resources!': [
+        'runtime/app/app-Info.plist',
+      ],
+      'xcode_settings': {
+        'INFOPLIST_FILE': 'runtime/app/app-Info.plist',
+      },
+      'msvs_settings': {
+        'VCLinkerTool': {
+          'SubSystem': '2',  # Set /SUBSYSTEM:WINDOWS
+        },
+      },
+    },
+  ], # targets
+  'conditions': [
+    ['OS=="linux"', {
+      'includes': [ 'extensions/xesh/xesh.gypi' ],
+    }],
+    ['OS=="mac"', {
+      'targets': [
+        {
+          'target_name': 'xwalk_framework',
+          'type': 'shared_library',
+          'product_name': '<(xwalk_product_name) Framework',
+          'mac_bundle': 1,
+          'mac_bundle_resources': [
+            'runtime/app/English.lproj/MainMenu.xib',
+            '<(PRODUCT_DIR)/xwalk.pak'
+          ],
+          'dependencies': [
+            'xwalk_runtime',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            'runtime/app/xwalk_content_main.cc',
+            'runtime/app/xwalk_content_main.h',
+          ],
+          'copies': [
+            {
+              # Copy FFmpeg binaries for audio/video support.
+              'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
+              'files': [
+                '<(PRODUCT_DIR)/ffmpegsumo.so',
+              ],
+            },
+          ],
+          'conditions': [
+            ['enable_webrtc==1', {
+              'variables': {
+                'libpeer_target_type%': 'static_library',
+              },
+              'conditions': [
+                ['libpeer_target_type!="static_library"', {
+                  'copies': [{
+                   'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
+                   'files': [
+                      '<(PRODUCT_DIR)/libpeerconnection.so',
+                    ],
+                  }],
+                }],
+              ],
+            }],
+            ['icu_use_data_file_flag==1', {
+              'mac_bundle_resources': [
+                '<(PRODUCT_DIR)/icudtl.dat',
+              ],
+            }],
+          ],
+        },  # target xwalk_framework
+        {
+          'target_name': 'xwalk_helper_app',
+          'type': 'executable',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'product_name': '<(xwalk_product_name) Helper',
+          'mac_bundle': 1,
+          'dependencies': [
+            'xwalk_framework',
+          ],
+          'sources': [
+            'runtime/app/xwalk_main.cc',
+            'runtime/app/helper-Info.plist',
+          ],
+          # TODO(mark): Come up with a fancier way to do this.  It should only
+          # be necessary to list helper-Info.plist once, not the three times it
+          # is listed here.
+          'mac_bundle_resources!': [
+            'runtime/app/helper-Info.plist',
+          ],
+          # TODO(mark): For now, don't put any resources into this app.  Its
+          # resources directory will be a symbolic link to the browser app's
+          # resources directory.
+          'mac_bundle_resources/': [
+            ['exclude', '.*'],
+          ],
+          'xcode_settings': {
+            'INFOPLIST_FILE': 'runtime/app/helper-Info.plist',
+          },
+          'postbuilds': [
+            {
+              # The framework defines its load-time path
+              # (DYLIB_INSTALL_NAME_BASE) relative to the main executable
+              # (chrome).  A different relative path needs to be used in
+              # xwalk_helper_app.
+              'postbuild_name': 'Fix Framework Link',
+              'action': [
+                'install_name_tool',
+                '-change',
+                '/Library/Frameworks/<(xwalk_product_name) Framework.framework/Versions/A/<(xwalk_product_name) Framework',
+                '@executable_path/../../../../Frameworks/<(xwalk_product_name) Framework.framework/<(xwalk_product_name) Framework',
+                '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}'
+              ],
+            },
+            {
+              # Modify the Info.plist as needed.  The script explains why this
+              # is needed.  This is also done in the chrome and chrome_dll
+              # targets.  In this case, --breakpad=0, --keystone=0, and --scm=0
+              # are used because Breakpad, Keystone, and SCM keys are
+              # never placed into the helper.
+              'postbuild_name': 'Tweak Info.plist',
+              'action': ['../build/mac/tweak_info_plist.py',
+                         '--breakpad=0',
+                         '--keystone=0',
+                         '--scm=0',
+                         '--version=<(xwalk_version)'],
+            },
+            {
+              # Make sure there isn't any Objective-C in the helper app's
+              # executable.
+              'postbuild_name': 'Verify No Objective-C',
+              'action': [
+                '../build/mac/verify_no_objc.sh',
+              ],
+            },
+          ],
+          'conditions': [
+            ['component=="shared_library"', {
+              'xcode_settings': {
+                'LD_RUNPATH_SEARCH_PATHS': [
+                  # Get back from XWalk.app/Contents/Frameworks/
+                  #                                 Helper.app/Contents/MacOS
+                  '@loader_path/../../../../../..',
+                ],
+              },
+            }],
+          ],
+        },  # target xwalk_helper_app
+      ],
+    }],  # OS=="mac"
+    ['OS=="android"', {
+      'variables': {
+        'variables': {
+          'conditions': [
+            ['android_app_abi=="x86"', {
+              'version_code_shift%': 1,
+            }],
+            ['android_app_abi=="armeabi-v7a"', {
+              'version_code_shift%': 2,
+            }],
+            ['android_app_abi=="armeabi"', {
+              'version_code_shift%': 3,
+            }],
+          ], # conditions
+        },
+        'version_code_shift%': '<(version_code_shift)',
+        'xwalk_version_code': '<!(python tools/build/android/generate_version_code.py -f VERSION -s <(version_code_shift))',
+      },
+      'includes': [
+        'xwalk_android.gypi',
+        'xwalk_android_tests.gypi',
+        'xwalk_android_app.gypi',
+        'xwalk_core_library_android.gypi',
+      ],
+      'targets': [
+      {
+        'target_name': 'All',
+        'type': 'none',
+        'dependencies': [
+          'xwalk',
+        ],
+      }, # target_name: All
+    ],  # targets
+    }], # OS=="android"
+  ]
+}