diff --git a/README b/README
index c8daf328..066ff8a1 100644
--- a/README
+++ b/README
@@ -75,8 +75,6 @@ Troubleshooting:
       # rm -rvf /usr/share/config/kdm
       # genkdmconf
 
-<<<<<<< HEAD
-=======
 * AHH! Something is wrong with Unity!
 
     Try resetting the settings for Unity and Compiz and relogin:
@@ -93,7 +91,6 @@ Troubleshooting:
 
       https://bugs.launchpad.net/unity-for-arch
 
->>>>>>> parent of a6d0942... [unity-lens-video] Removed: https://bbs.archlinux.org/viewtopic.php?pid=1199369#p1199369
 * qt-ubuntu does not build.
 
     Temporary remove the qtwebkit package (ignoring dependencies) by running:
diff --git a/compiz-ubuntu/0002_Fix_cmake_install_dir.patch b/compiz-ubuntu/0002_Fix_cmake_install_dir.patch
new file mode 100644
index 00000000..59fde935
--- /dev/null
+++ b/compiz-ubuntu/0002_Fix_cmake_install_dir.patch
@@ -0,0 +1,21 @@
+diff -Nru compiz-0.9.8.0.orig/cmake/base.cmake compiz-0.9.8.0/cmake/base.cmake
+--- compiz-0.9.8.0.orig/cmake/base.cmake	2012-09-01 14:23:11.224436306 -0400
++++ compiz-0.9.8.0/cmake/base.cmake	2012-09-01 14:24:19.408308480 -0400
+@@ -53,7 +53,7 @@
+ 	     ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindCompiz.cmake
+ 	     ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindOpenGLES2.cmake
+ 	     DESTINATION
+-	     ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
++	     ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/)
+     add_custom_target (findcompiz_install
+ 	${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
+ 	${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${CMAKE_ROOT}/Modules
+@@ -70,7 +70,7 @@
+     install (FILES
+ 	     ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake
+ 	     DESTINATION
+-	     ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
++	     ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/)
+     add_custom_target (
+ 	findcompizconfig_install
+ 	${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
diff --git a/compiz-ubuntu/0003_Fix_python_install_command.patch b/compiz-ubuntu/0003_Fix_python_install_command.patch
new file mode 100644
index 00000000..1c012d62
--- /dev/null
+++ b/compiz-ubuntu/0003_Fix_python_install_command.patch
@@ -0,0 +1,23 @@
+diff -Nru compiz-0.9.8.2.orig/compizconfig/cmake/exec_setup_py_with_destdir.cmake compiz-0.9.8.2/compizconfig/cmake/exec_setup_py_with_destdir.cmake
+--- compiz-0.9.8.2.orig/compizconfig/cmake/exec_setup_py_with_destdir.cmake	2012-09-14 09:12:02.570519812 -0400
++++ compiz-0.9.8.2/compizconfig/cmake/exec_setup_py_with_destdir.cmake	2012-09-14 09:14:13.013261387 -0400
+@@ -4,7 +4,6 @@
+ set (VERSION "" CACHE FORCE "Version")
+ 
+ set (EXTRAARGS "")
+-set (BUILD_DEB $ENV{COMPIZ_DEB_BUILD})
+ 
+ set (INSTALL_ROOT $ENV{DESTDIR})
+ 
+@@ -16,10 +15,5 @@
+ 
+ cmake_policy (SET CMP0012 NEW)
+ 
+-if (BUILD_DEB)
+-    message ("Installing Debian Format")
+-    set (EXTRAARGS "--install-layout=deb")
+-endif (BUILD_DEB)
+-
+-execute_process (COMMAND python ${SETUP} install ${EXTRAARGS} --prefix=${PREFIX} --version=${VERSION} ${INSTALL_ROOT_ARGS}
++execute_process (COMMAND python2 ${SETUP} install ${EXTRAARGS} --prefix=${PREFIX} --version=${VERSION} ${INSTALL_ROOT_ARGS}
+ 	 		   WORKING_DIRECTORY ${WDIR})
diff --git a/compiz-ubuntu/0004_Use_python2.patch b/compiz-ubuntu/0004_Use_python2.patch
new file mode 100644
index 00000000..b9f0afd7
--- /dev/null
+++ b/compiz-ubuntu/0004_Use_python2.patch
@@ -0,0 +1,114 @@
+diff -Nru compiz-0.9.8.4.orig/compizconfig/ccsm/ccsm compiz-0.9.8.4/compizconfig/ccsm/ccsm
+--- compiz-0.9.8.4.orig/compizconfig/ccsm/ccsm	2012-10-02 14:20:36.950419021 -0400
++++ compiz-0.9.8.4/compizconfig/ccsm/ccsm	2012-10-02 14:22:53.066348284 -0400
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ # -*- coding: UTF-8 -*-
+ 
+ # This program is free software; you can redistribute it and/or
+diff -Nru compiz-0.9.8.4.orig/compizconfig/ccsm/CMakeLists.txt compiz-0.9.8.4/compizconfig/ccsm/CMakeLists.txt
+--- compiz-0.9.8.4.orig/compizconfig/ccsm/CMakeLists.txt	2012-10-02 14:20:36.953752336 -0400
++++ compiz-0.9.8.4/compizconfig/ccsm/CMakeLists.txt	2012-10-02 14:22:29.463142821 -0400
+@@ -12,7 +12,7 @@
+ execute_process (COMMAND uname -p OUTPUT_VARIABLE PROC_ARCH)
+ 
+ # Get Python Version
+-execute_process (COMMAND python -c "import sys; print str (sys.version_info[0]) + '.' + str (sys.version_info[1])"
++execute_process (COMMAND python2 -c "import sys; print str (sys.version_info[0]) + '.' + str (sys.version_info[1])"
+ 		 OUTPUT_VARIABLE PY_VERSION)
+ 
+ string (REPLACE "\n" "" PROC_ARCH ${PROC_ARCH})
+@@ -36,7 +36,7 @@
+ set (VERSION ${COMPIZ_RELEASE_VERSION})
+ 
+ add_custom_command (OUTPUT ${PY_CCSM_LIB}
+-		    COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build --version=${VERSION}
++		    COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build --version=${VERSION}
+ 		    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ 		    COMMENT "Generating Python Bytecode")
+ 
+@@ -44,7 +44,7 @@
+                    ${PY_CCSM_LIB})
+ 
+ add_custom_target (uninstall
+-		   COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX}
++		   COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX}
+ 		   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ 		   COMMENT "Uninstalling Python Files")
+ 
+diff -Nru compiz-0.9.8.4.orig/compizconfig/ccsm/Makefile compiz-0.9.8.4/compizconfig/ccsm/Makefile
+--- compiz-0.9.8.4.orig/compizconfig/ccsm/Makefile	2012-10-02 14:20:36.883752714 -0400
++++ compiz-0.9.8.4/compizconfig/ccsm/Makefile	2012-10-02 14:22:42.059741246 -0400
+@@ -1,11 +1,11 @@
+ all:
+-	@python setup.py build --prefix=${PREFIX}
++	@python2 setup.py build --prefix=${PREFIX}
+ 
+ install: all
+-	@python setup.py install --prefix=${PREFIX}
++	@python2 setup.py install --prefix=${PREFIX}
+ 
+ uninstall:
+-	@python setup.py uninstall --prefix=${PREFIX}
++	@python2 setup.py uninstall --prefix=${PREFIX}
+ 
+ clean:
+ 	rm -rf build/
+diff -Nru compiz-0.9.8.4.orig/compizconfig/compizconfig-python/CMakeLists.txt compiz-0.9.8.4/compizconfig/compizconfig-python/CMakeLists.txt
+--- compiz-0.9.8.4.orig/compizconfig/compizconfig-python/CMakeLists.txt	2012-10-02 14:20:37.010418695 -0400
++++ compiz-0.9.8.4/compizconfig/compizconfig-python/CMakeLists.txt	2012-10-02 14:23:38.342769668 -0400
+@@ -12,7 +12,7 @@
+ execute_process (COMMAND uname -p OUTPUT_VARIABLE PROC_ARCH)
+ 
+ # Get Python Version
+-execute_process (COMMAND python -c "import sys; print str (sys.version_info[0]) + '.' + str (sys.version_info[1])"
++execute_process (COMMAND python2 -c "import sys; print str (sys.version_info[0]) + '.' + str (sys.version_info[1])"
+ 		 OUTPUT_VARIABLE PY_VERSION)
+ 
+ string (REPLACE "\n" "" PROC_ARCH ${PROC_ARCH})
+@@ -37,7 +37,7 @@
+                 ${CMAKE_CURRENT_BINARY_DIR}/compizconfig-python.pc)
+ 
+ add_custom_command (OUTPUT ${PY_COMPIZCONFIG_LIB}
+-		    COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build --version=${VERSION}
++		    COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build --version=${VERSION}
+ 		    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ 		    DEPENDS ${PY_COMPIZCONFIG_SRC} ${PY_COMPIZCONFIG_VERSION} compizconfig
+ 		    COMMENT "Generating Python Bytecode")
+@@ -46,7 +46,7 @@
+                    ${PY_COMPIZCONFIG_LIB})
+ 
+ add_custom_target (uninstall
+-		   COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX}
++		   COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX}
+ 		   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ 		   COMMENT "Uninstalling Python Files")
+ 
+@@ -60,7 +60,7 @@
+ if (COMPIZ_BUILD_TESTING)
+ 
+         find_program (BASH_EXECUTABLE bash)
+-	find_program (PYTHON_EXECUTABLE python)
++	find_program (PYTHON_EXECUTABLE python2)
+ 	mark_as_advanced (FORCE PYTHON_EXECUTABLE)
+ 
+ 	file (GLOB PYTHON_TESTS "tests/test_*.py")
+diff -Nru compiz-0.9.8.4.orig/compizconfig/compizconfig-python/Makefile compiz-0.9.8.4/compizconfig/compizconfig-python/Makefile
+--- compiz-0.9.8.4.orig/compizconfig/compizconfig-python/Makefile	2012-10-02 14:20:37.007085379 -0400
++++ compiz-0.9.8.4/compizconfig/compizconfig-python/Makefile	2012-10-02 14:23:53.262688839 -0400
+@@ -1,11 +1,11 @@
+ all:
+-	@python setup.py build --prefix=${PREFIX}
++	@python2 setup.py build --prefix=${PREFIX}
+ 
+ install: all
+-	@python setup.py install --prefix=${PREFIX}
++	@python2 setup.py install --prefix=${PREFIX}
+ 
+ uninstall:
+-	@python setup.py uninstall --prefix=${PREFIX}
++	@python2 setup.py uninstall --prefix=${PREFIX}
+ 
+ clean:
+ 	rm -rf build/
diff --git a/compiz-ubuntu/PKGBUILD b/compiz-ubuntu/PKGBUILD
new file mode 100644
index 00000000..c76ef84e
--- /dev/null
+++ b/compiz-ubuntu/PKGBUILD
@@ -0,0 +1,190 @@
+# Maintainer: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+
+# Some comments are taken from the Ubuntu packaging files
+
+# Since all parts of Compiz are now released together upstream, I will not split
+# this package anymore. There are far too many packages to split and Arch/pacman
+# makes it extremely hard to do.
+pkgname=compiz-ubuntu
+
+_ubuntu_rel=0ubuntu1
+_actual_ver=0.9.8.4
+_bzr_rev=3412
+
+pkgver=${_actual_ver}.bzr${_bzr_rev}.${_ubuntu_rel}
+
+pkgrel=100
+pkgdesc="OpenGL window and compositing manager"
+url="http://www.compiz.org/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('boost-libs' 'dbus' 'fuse' 'glibmm' 'gnome-control-center' 'librsvg' 'libxcomposite' 'libxdamage' 'libxinerama' 'libxrandr' 'libxslt' 'libwnck' 'mesa' 'metacity-ubuntu' 'startup-notification' 'protobuf' 'pyrex' 'gsettings-desktop-schemas' 'python2-gconf')
+makedepends=('boost' 'cmake' 'intltool' 'libwnck')
+provides=(compiz-core{,-ubuntu}="${pkgver}"
+          compiz-gnome{,-ubuntu}="${pkgver}"
+          compiz-kde{,-ubuntu}="${pkgver}"
+          libcompizconfig{,-ubuntu}="${pkgver}"
+          compizconfig-backend-gconf{,-ubuntu}="${pkgver}"
+          compizconfig-backend-kconfig4{,-ubuntu}="${pkgver}"
+          compizconfig-python{,-ubuntu}="${pkgver}"
+          ccsm{,-ubuntu}="${pkgver}"
+          compiz-plugins-main{,-ubuntu}="${pkgver}"
+          compiz-plugins-extra{,-ubuntu}="${pkgver}")
+conflicts=(compiz-core{,-ubuntu}
+           compiz-gnome{,-ubuntu}
+           compiz-kde{,-ubuntu}
+           libcompizconfig{,-ubuntu}
+           compizconfig-backend-gconf{,-ubuntu}
+           compizconfig-backend-kconfig4{,-ubuntu}
+           compizconfig-python{,-ubuntu}
+           ccsm{,-ubuntu}
+           compiz-plugins-main{,-ubuntu}
+           compiz-plugins-extra{,-ubuntu})
+groups=('unity')
+options=('emptydirs')
+install=compiz-ubuntu.install
+source=("https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname%-*}_${_actual_ver}+bzr${_bzr_rev}.orig.tar.gz"
+        "https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname%-*}_${_actual_ver}+bzr${_bzr_rev}-${_ubuntu_rel}.diff.gz"
+        'compiz.reset'
+        '0002_Fix_cmake_install_dir.patch'
+        '0003_Fix_python_install_command.patch'
+        '0004_Use_python2.patch'
+        'compiz-migrate-to-dconf.desktop')
+sha512sums=('05931a265ea47d3a977e1e419782bc84f1a833365100dad5a5ed68a97b803f5375a901e41ebf4538cd281edafc9559351f7dda09002a2716df6a820fd0ea9a00'
+            'e0e5f5b0bc63043e2a3afd5ff55c06debaddb4f90a31019f7aeaf32f195182f85f7d569c75b179ce00da66f0f7f2937aa6368f6fbf3e904791c89c10fefde9fb'
+            '7a97d46efde7d1cda2d1043998969aac509e453cd65ef9bb94a4edf91f71c3e6eb204b5e1729fa619bae77a2b9c949bf9e92b3d56bb7c5e791558e2d7961e154'
+            'ba80a6e5c3a7b488974046f8c1b906bb178691a9224b5c8f3542e0948099e2291b8888fbd4f591eaa16f9209e7288f11e122d1673731e7f1aa7c84aa6e3207c6'
+            'bd7c8c0bf4cb3767c5b4b6d9c2d79e958ff9f34375a8223b509aec16b3682e219568e17378fa392f6ca4267f695835d83ef1c5db12898ea7b7cc75e1151d02b2'
+            '037a30c8dcba1167a2aca7361d7bdc49095ce9c0710ccc6aae011367a867b775c0bdfc409b9e52ead908cbb7d94ad88de1501a5277779728d71410248870af16'
+            'affbff2a8ce7d5f223ce86407ef0e80769f9df47228b7acdf25d0ac82b70b80a9b0bce4507df928b9738ef69d1dc8ab3a3622094b2e765f89d54db2b10899cc8')
+
+build() {
+  cd "${srcdir}/${pkgname%-*}-0.9.8.5"
+
+  # Fix the directory for FindCompiz.cmake and FindCompizConfig.cmake
+  patch -Np1 -i "${srcdir}/0002_Fix_cmake_install_dir.patch"
+
+  # Compiz's build system appends --install-layout=deb to the python 2 install
+  # command (for python-compizconfig and ccsm) whether or not COMPIZ_DEB_BUILD
+  # is set to 1
+  patch -Np1 -i "${srcdir}/0003_Fix_python_install_command.patch"
+
+  # Use python 2
+  patch -Np1 -i "${srcdir}/0004_Use_python2.patch"
+
+  # Apply Ubuntu patches
+  patch -Np1 -i "${srcdir}/${pkgname%-*}_${_actual_ver}+bzr${_bzr_rev}-${_ubuntu_rel}.diff"
+
+  for i in $(cat debian/patches/series | grep -v '#'); do
+    patch -Np1 -i "debian/patches/${i}"
+  done
+
+  # Disable '-Bsymbolic-functions' if present so libcompiz_core won't be
+  # loaded once per plugin
+  LDFLAGS="$(echo ${LDFLAGS} | sed 's/-B[ ]*symbolic-functions//')"
+
+  # Disable rpath in Python 2 bindings
+  export COMPIZ_DISABLE_RPATH=1
+
+  # Compiz will segfault if the CMake built target is set to 'Release'
+  # Disable tests since they can't run on a headless build server
+
+  [[ -d build ]] && rm -rvf build/
+  mkdir build/
+  cd build/
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCOMPIZ_BUILD_WITH_RPATH=FALSE \
+    -DCOMPIZ_DEFAULT_PLUGINS="ccp" \
+    `# -DCMAKE_BUILD_TYPE=RelWithDebInfo` \
+    -DCMAKE_BUILD_TYPE=Debug \
+    -DCOMPIZ_PACKAGING_ENABLED=TRUE \
+    -DUSE_GSETTINGS=ON \
+    -DUSE_GCONF=OFF \
+    -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF \
+    -DCOMPIZ_BUILD_TESTING=OFF \
+    -DCOMPIZ_DISABLE_PLUGIN_KDE=ON \
+    -DUSE_KDE4=OFF
+
+  make -j1
+}
+
+package() {
+  cd "${srcdir}/${pkgname%-*}-0.9.8.5/build"
+  GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR="${pkgdir}"
+
+  # Stupid findcompiz_install needs COMPIZ_DESTDIR and install needs DESTDIR
+  #make findcompiz_install
+  CMAKE_DIR=$(cmake --system-information | grep '^CMAKE_ROOT' \
+    | awk -F\" '{print $2}')
+  install -dm755 "${pkgdir}${CMAKE_DIR}/Modules/"
+  install -m644 ../cmake/FindCompiz.cmake \
+    "${pkgdir}${CMAKE_DIR}/Modules/"
+
+  # Install documentation
+  install -dm755 "${pkgdir}/usr/share/doc/compiz/"
+  install ../{AUTHORS,NEWS,README} \
+    "${pkgdir}/usr/share/doc/compiz/"
+
+  # Install Ubuntu's files
+  install -dm755 "${pkgdir}/usr/share/man/man1/"
+  install -dm755 "${pkgdir}/etc/X11/xinit/xinitrc.d/"
+  install -dm755 "${pkgdir}/etc/compizconfig/upgrades/"
+  install -dm755 "${pkgdir}/usr/share/gnome/wm-properties/"
+
+  # Install manual pages
+  install -m644 ../debian/{ccsm,compiz,gtk-window-decorator}.1 \
+    "${pkgdir}/usr/share/man/man1/"
+
+  # Window manager desktop file for GNOME
+  install -m644 \
+    "${pkgdir}/usr/share/applications/compiz.desktop" \
+    "${pkgdir}/usr/share/gnome/wm-properties/"
+
+  # Install X11 startup script
+  install -m755 ../debian/65compiz_profile-on-session \
+    "${pkgdir}/etc/X11/xinit/xinitrc.d/"
+
+  # Unity Compiz profile configuration file
+  install -m644 ../debian/unity.ini "${pkgdir}/etc/compizconfig/"
+
+  # Install Compiz profile configuration file
+  install -m644 ../debian/config "${pkgdir}/etc/compizconfig/"
+
+  # Compiz profile upgrade helper files for ensuring smooth upgrades from older
+  # configuration files
+  pushd ../debian/profile_upgrades/
+  find . -type f -name '*.upgrade' -exec \
+    install -m644 {} "${pkgdir}"/etc/compizconfig/upgrades/{} \;
+  popd
+
+  install -dm755 "${pkgdir}/usr/lib/compiz/migration/"
+  pushd ../postinst/convert-files/
+  find . -type f -name '*.convert' -exec \
+    install -m644 {} "${pkgdir}"/usr/lib/compiz/migration/{} \;
+  popd
+
+  # Install keybinding files
+  install -dm755 "${pkgdir}/usr/share/gnome-control-center/keybindings/"
+  find ../*/gtk/gnome/ -name *.xml -exec install {} \
+    "${pkgdir}/usr/share/gnome-control-center/keybindings/" \;
+
+  # Default GSettings settings
+  install -m644 ../debian/compiz-gnome.gsettings-override \
+    "${pkgdir}/usr/share/glib-2.0/schemas/10_compiz-ubuntu.gschema.override"
+
+  # Install script for resetting all of Compiz's settings
+  install "${srcdir}/compiz.reset" "${pkgdir}/usr/bin/compiz.reset"
+
+  # Install script for migrating GConf settings to GSettings
+  install -dm755 "${pkgdir}/etc/xdg/autostart/"
+  install -m644 ../postinst/migration-scripts/02_migrate_to_gsettings.py \
+    "${pkgdir}/usr/lib/compiz/"
+  install -m644 "${srcdir}/compiz-migrate-to-dconf.desktop" \
+    "${pkgdir}/etc/xdg/autostart/"
+
+  # Remove GConf schemas
+  rm -rv "${pkgdir}/usr/share/gconf/"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/compiz-ubuntu/compare_versions.sh b/compiz-ubuntu/compare_versions.sh
new file mode 100755
index 00000000..90f02ee2
--- /dev/null
+++ b/compiz-ubuntu/compare_versions.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+source "$(dirname ${0})/PKGBUILD"
+
+echo "Getting latest Ubuntu version..."
+UBUNTU_VER=($(wget -q -O - 'https://launchpad.net/ubuntu/raring/+source/compiz' | sed -n 's/^.*current\ release\ (\(.*\)-\(.*\)).*$/\1 \2/p'))
+
+echo ""
+
+echo -e "PKGBUILD version: ${_actual_ver}+bzr${_bzr_rev} ${_ubuntu_rel}"
+echo -e "Upstream version: (none)"
+echo -e "Ubuntu version:   ${UBUNTU_VER[@]}"
diff --git a/compiz-ubuntu/compiz-migrate-to-dconf.desktop b/compiz-ubuntu/compiz-migrate-to-dconf.desktop
new file mode 100644
index 00000000..ef9c9c8c
--- /dev/null
+++ b/compiz-ubuntu/compiz-migrate-to-dconf.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Migrate Compiz settings to DConf
+Comment=Migrate Compiz settings from GConf to GSettings
+Exec=python2 /usr/lib/compiz/02_migrate_to_gsettings.py
+Terminal=false
+Type=Application
+Categories=
+OnlyShowIn=Unity;
diff --git a/compiz-ubuntu/compiz-ubuntu.install b/compiz-ubuntu/compiz-ubuntu.install
new file mode 100644
index 00000000..72eb2722
--- /dev/null
+++ b/compiz-ubuntu/compiz-ubuntu.install
@@ -0,0 +1,57 @@
+OLD_SCHEMAS=(compiz-animationaddon.schemas compiz-bicubic.schemas
+             compiz-blur.schemas compiz-colorfilter.schemas
+             compiz-cubeaddon.schemas compiz-gears.schemas
+             compiz-group.schemas compiz-loginout.schemas
+             compiz-reflex.schemas compiz-thumbnail.schemas
+             compiz-wallpaper.schemas)
+SCHEMAS=(compiz-addhelper.schemas compiz-animation.schemas
+         compiz-annotate.schemas compiz-bench.schemas compiz-ccp.schemas
+         compiz-clone.schemas compiz-commands.schemas
+         compiz-compiztoolbox.schemas compiz-composite.schemas
+         compiz-copytex.schemas compiz-core.schemas compiz-crashhandler.schemas
+         compiz-cube.schemas compiz-dbus.schemas compiz-decor.schemas
+         compiz-expo.schemas compiz-extrawm.schemas compiz-ezoom.schemas
+         compiz-fadedesktop.schemas compiz-fade.schemas compiz-firepaint.schemas
+         compiz-gnomecompat.schemas compiz-grid.schemas compiz-imgjpeg.schemas
+         compiz-imgpng.schemas compiz-imgsvg.schemas compiz-inotify.schemas
+         compiz-kdecompat.schemas compiz-mag.schemas compiz-maximumize.schemas
+         compiz-mblur.schemas compiz-mousepoll.schemas compiz-move.schemas
+         compiz-neg.schemas compiz-notification.schemas compiz-obs.schemas
+         compiz-opacify.schemas compiz-opengl.schemas compiz-place.schemas
+         compiz-put.schemas compiz-regex.schemas compiz-resizeinfo.schemas
+         compiz-resize.schemas compiz-ring.schemas compiz-rotate.schemas
+         compiz-scaleaddon.schemas compiz-scalefilter.schemas
+         compiz-scale.schemas compiz-screenshot.schemas compiz-session.schemas
+         compiz-shelf.schemas compiz-shift.schemas compiz-showdesktop.schemas
+         compiz-showmouse.schemas compiz-showrepaint.schemas compiz-snap.schemas
+         compiz-splash.schemas compiz-staticswitcher.schemas
+         compiz-switcher.schemas compiz-td.schemas compiz-text.schemas
+         compiz-titleinfo.schemas compiz-trailfocus.schemas
+         compiz-vpswitch.schemas compiz-wall.schemas compiz-water.schemas
+         compiz-widget.schemas compiz-winrules.schemas compiz-wobbly.schemas
+         compiz-workarounds.schemas compiz-workspacenames.schemas gwd.schemas)
+
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas/
+}
+
+pre_remove() {
+  if [ 0$(vercmp ${1} 0.9.8.2.bzr3377.0ubuntu1) -lt 0 ]; then
+    gconf-schemas --unregister ${SCHEMAS[@]} ${OLD_SCHEMAS[@]}
+    if [ -f /usr/share/gconf/schemas/compiz-kde.schemas ]; then
+      gconf-schemas --unregister compiz-kde.schemas
+    fi
+  fi
+}
+
+pre_upgrade() {
+  pre_remove
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  glib-compile-schemas usr/share/glib-2.0/schemas/
+}
diff --git a/compiz-ubuntu/compiz.reset b/compiz-ubuntu/compiz.reset
new file mode 100644
index 00000000..804aab38
--- /dev/null
+++ b/compiz-ubuntu/compiz.reset
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# Reset all of Compiz's settings for the current user
+
+echo "This will reset all of Compiz's settings. Continue only if you know exactly"
+echo "what is being done."
+echo ""
+echo "This program will:"
+echo "  1. Switch to the metacity window manager"
+echo "  2. Remove Compiz's configuration directories"
+echo
+read -p "Continue (y/N) " PROCEED
+
+if [ "x${PROCEED}" == "xy" ] || [ "x${PROCEED}" == "xY" ]; then
+  echo
+
+  # Start metacity
+  echo -n "Switching to the metacity window manager..."
+  metacity --replace &>/dev/null &
+  echo "DONE"
+
+  # Wait for Compiz to exit
+  echo -n "Waiting for Compiz to exit..."
+  while $(pgrep compiz.bin &>/dev/null); do
+    sleep 0.1
+  done
+  echo "DONE"
+
+  # Remove Compiz's configuration directories
+  echo -n "Removing Compiz's configuration directories..."
+  rm -rf ~/.compiz/
+  rm -rf ~/.compiz-1/
+  rm -rf ~/.cache/compizconfig-1/
+  rm -rf ~/.config/compiz-1/
+  echo "DONE"
+
+  echo
+  echo "Please log out and log back in. To log out, run:"
+  echo "  gnome-session-quit --logout"
+fi