diff --git a/srcpkgs/Cython/template b/srcpkgs/Cython/template
index cdd6264ec7..c0ee93a9cf 100644
--- a/srcpkgs/Cython/template
+++ b/srcpkgs/Cython/template
@@ -1,7 +1,7 @@
 # Template file for 'Cython'
 pkgname=Cython
 version=0.13
-revision=1
+revision=2
 distfiles="http://www.cython.org/release/$pkgname-$version.tar.gz"
 build_style=python-module
 make_build_args="--prefix=/usr"
@@ -23,6 +23,8 @@ long_desc="
  This makes Cython the ideal language for wrapping external C libraries, and
  for fast C modules that speed up the execution of Python code."
 
+pycompile_module="pyximport Cython ."
+
 Add_dependency run glibc
 Add_dependency run python
 Add_dependency full Pyrex
diff --git a/srcpkgs/MoinMoin/template b/srcpkgs/MoinMoin/template
index 7695eab63d..68b5e79b6c 100644
--- a/srcpkgs/MoinMoin/template
+++ b/srcpkgs/MoinMoin/template
@@ -1,7 +1,7 @@
 # Template file for 'MoinMoin'
 pkgname=MoinMoin
 version=1.9.2
-revision=1
+revision=2
 wrksrc=moin-${version}
 distfiles="http://static.moinmo.in/files/moin-${version}.tar.gz"
 build_style=python-module
@@ -17,4 +17,6 @@ long_desc="
  only requiring a Python installation."
 
 noarch=yes
+pycompile_module="$pkgname jabberbot"
+
 Add_dependency full python
diff --git a/srcpkgs/Pyrex/template b/srcpkgs/Pyrex/template
index caa671cf91..f917490f70 100644
--- a/srcpkgs/Pyrex/template
+++ b/srcpkgs/Pyrex/template
@@ -1,7 +1,7 @@
 # Template file for 'Pyrex'
 pkgname=Pyrex
 version=0.9.9
-revision=1
+revision=2
 distfiles="http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/Pyrex-$version.tar.gz"
 build_style=python-module
 short_desc="Language for writing Python extension modules"
@@ -14,4 +14,6 @@ long_desc="
  want, and compiles it into a C extension for Python."
 
 noarch=yes
+pycompile_module="$pkgname"
+
 Add_dependency full python
diff --git a/srcpkgs/Twisted/template b/srcpkgs/Twisted/template
index 036c3019dd..2d9bc3b254 100644
--- a/srcpkgs/Twisted/template
+++ b/srcpkgs/Twisted/template
@@ -1,6 +1,7 @@
 # Template file for 'Twisted'
 pkgname=Twisted
 version=11.0.0
+revision=1
 distfiles="http://twistedmatrix.com/Releases/Twisted/${version%.*}/Twisted-${version}.tar.bz2"
 build_style=python-module
 short_desc="Event-driven networking engine written in Python"
@@ -39,6 +40,8 @@ long_desc="
   - twisted.trial
     A unit testing framework that integrates well with Twisted-based code."
 
+pycompile_module="twisted"
+
 Add_dependency run glibc
 Add_dependency full python
 Add_dependency full zope.interface
diff --git a/srcpkgs/avahi/avahi-discover.template b/srcpkgs/avahi/avahi-discover.template
index b0aca5657a..a795d0c7da 100644
--- a/srcpkgs/avahi/avahi-discover.template
+++ b/srcpkgs/avahi/avahi-discover.template
@@ -5,6 +5,10 @@ long_desc="${long_desc}
 
  This package contains a user interface for discovering services."
 
+revision=1
+noarch=yes
+pycompile_module="avahi_discover"
+
 Add_dependency run avahi
 Add_dependency run python
 Add_dependency run avahi-python
@@ -12,7 +16,6 @@ Add_dependency run dbus-python
 Add_dependency run pygtk
 Add_dependency run desktop-file-utils
 
-noarch=yes
 
 do_install()
 {
diff --git a/srcpkgs/avahi/avahi-python.template b/srcpkgs/avahi/avahi-python.template
index 3bb6c4219f..4e8b7f6f7d 100644
--- a/srcpkgs/avahi/avahi-python.template
+++ b/srcpkgs/avahi/avahi-python.template
@@ -5,11 +5,13 @@ long_desc="${long_desc}
 
  This package contains utility modules to talk to Avahi with Python easier."
 
+revision=1
+noarch=yes
+pycompile_module="avahi"
+
 Add_dependency run python
 Add_dependency run dbus-python
 
-noarch=yes
-
 do_install()
 {
 	vmove "usr/lib/python*" usr/lib
diff --git a/srcpkgs/blueman/template b/srcpkgs/blueman/template
index aa945b00df..d01444613d 100644
--- a/srcpkgs/blueman/template
+++ b/srcpkgs/blueman/template
@@ -1,7 +1,7 @@
 # Template file for 'blueman'
 pkgname=blueman
 version=1.21
-revision=3
+revision=4
 distfiles="http://download.tuxfamily.org/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--enable-polkit=yes --enable-hal=no"
@@ -19,6 +19,7 @@ long_desc="
   * Sending/Receiving/Browsing files via OBEX
   * Pairing"
 
+pycompile_module="$pkgname"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 Add_dependency run glibc
diff --git a/srcpkgs/buildbot-slave/template b/srcpkgs/buildbot-slave/template
index 0f1b6f8129..2a6fd252e5 100644
--- a/srcpkgs/buildbot-slave/template
+++ b/srcpkgs/buildbot-slave/template
@@ -1,6 +1,7 @@
 # Template file for 'buildbot-slave'
 pkgname=buildbot-slave
 version=0.8.4
+revision=1
 distfiles="http://buildbot.googlecode.com/files/$pkgname-$version.tar.gz"
 build_style=python-module
 short_desc="BuildBot Slave Daemon"
@@ -25,5 +26,7 @@ long_desc="
  is available in the buildbot package."
 
 noarch=yes
+pycompile_module="buildslave"
+
 Add_dependency full python
 Add_dependency full Twisted
diff --git a/srcpkgs/buildbot/template b/srcpkgs/buildbot/template
index 5f0b5b2b49..f7015fbd31 100644
--- a/srcpkgs/buildbot/template
+++ b/srcpkgs/buildbot/template
@@ -1,6 +1,7 @@
 # Template file for 'buildbot'
 pkgname=buildbot
 version=0.8.4
+revision=1
 distfiles="http://buildbot.googlecode.com/files/$pkgname-$version.tar.gz"
 build_style=python-module
 short_desc="A system to automate the compile/test cycle"
@@ -21,7 +22,9 @@ long_desc="
  lint checks, image size, compile time, and other build parameters can be
  tracked over time, are more visible, and are therefore easier to improve."
 
+pycompile_module="$pkgname"
 noarch=yes
+
 Add_dependency full python
 Add_dependency full python-jinja
 Add_dependency full Twisted
diff --git a/srcpkgs/bzr/template b/srcpkgs/bzr/template
index 3faff63e42..fdce8663f7 100644
--- a/srcpkgs/bzr/template
+++ b/srcpkgs/bzr/template
@@ -1,6 +1,7 @@
 # Template file for 'bzr'
 pkgname=bzr
 version=2.3.0
+revision=1
 distfiles="http://launchpad.net/bzr/2.3/$version/+download/bzr-$version.tar.gz"
 build_style=python-module
 short_desc="Distributed version control system that Just Works"
@@ -12,6 +13,8 @@ long_desc="
  Bazaar adapts to the way you want to work, and you can try it out in
  five minutes."
 
+pycompile_module="bzrlib"
+
 Add_dependency run glibc
 Add_dependency run zlib
 Add_dependency run python
diff --git a/srcpkgs/bzrtools/template b/srcpkgs/bzrtools/template
index 889d13557c..ec7859339e 100644
--- a/srcpkgs/bzrtools/template
+++ b/srcpkgs/bzrtools/template
@@ -1,6 +1,7 @@
 # Template file for 'bzrtools'
 pkgname=bzrtools
 version=2.3.0
+revision=1
 wrksrc=$pkgname
 distfiles="http://launchpad.net/$pkgname/trunk/$version/+download/$pkgname-$version.tar.gz"
 build_style=python-module
@@ -10,6 +11,8 @@ checksum=706270db274cdb4897eda1b8bb412383c71f6d1b3fac6ae3db587ac249ad5b79
 long_desc="
  This is a plugin providing a collection of utilities for bzr."
 
+pycompile_module="bzrlib/plugins/bzrtools"
 noarch=yes
+
 Add_dependency full python
 Add_dependency full bzr
diff --git a/srcpkgs/caribou/template b/srcpkgs/caribou/template
index f01ae677e2..b6e134fef3 100644
--- a/srcpkgs/caribou/template
+++ b/srcpkgs/caribou/template
@@ -1,7 +1,7 @@
 # Template file for 'caribou'
 pkgname=caribou
 version=0.4.0
-revision=1
+revision=2
 distfiles="${GNOME_SITE}/$pkgname/0.4/$pkgname-$version.tar.xz"
 build_style=gnu_configure
 configure_args="--disable-schemas-compile --disable-static
@@ -19,6 +19,7 @@ long_desc="
  who can use a mouse but not a hardware keyboard. This on-screen keyboard may
  also be useful for touch screen or tablet users."
 
+pycompile_module="$pkgname"
 subpackages="$pkgname-devel"
 
 Add_dependency run glibc
diff --git a/srcpkgs/cracklib/cracklib-python.template b/srcpkgs/cracklib/cracklib-python.template
index 5777c716a4..13e08957a8 100644
--- a/srcpkgs/cracklib/cracklib-python.template
+++ b/srcpkgs/cracklib/cracklib-python.template
@@ -5,7 +5,8 @@ long_desc="${long_desc}
 
  This package contains python bindings for cracklib."
 
-revision=1
+revision=2
+pycompile_module="."
 
 Add_dependency run glibc
 Add_dependency run zlib
diff --git a/srcpkgs/dbus-python/template b/srcpkgs/dbus-python/template
index 513d8371ea..eb3d4615ca 100644
--- a/srcpkgs/dbus-python/template
+++ b/srcpkgs/dbus-python/template
@@ -1,6 +1,7 @@
 # Template file for 'dbus-python'
 pkgname=dbus-python
 version=0.83.2
+revision=1
 distfiles="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 short_desc="D-Bus Python bindings"
@@ -9,6 +10,8 @@ checksum=883729c98f40790021e3be0f7028ae863ee1c4a7b922a5578c1342592adfff64
 long_desc="
  This package provides Python bindings for D-BUS."
 
+pycompile_module="dbus"
+
 Add_dependency run glibc
 Add_dependency run glib
 Add_dependency run dbus-libs
diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index c0b1348fa5..e8ecfe74b8 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,6 +1,7 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
 version=3.2.0
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
 build_style=gnu_configure
 configure_args="--localstatedir=/var"
@@ -17,6 +18,8 @@ long_desc="
 
  This package contains some useful plugins for the Eye of GNOME."
 
+pycompile_dirs="usr/lib/eog/plugins"
+
 # XXX postr plugin.
 Add_dependency run glibc
 Add_dependency run libpeas
diff --git a/srcpkgs/exo/exo-python.template b/srcpkgs/exo/exo-python.template
index 7eb18cc1a2..e6fde3c02a 100644
--- a/srcpkgs/exo/exo-python.template
+++ b/srcpkgs/exo/exo-python.template
@@ -5,6 +5,9 @@ long_desc="${long_desc}
 
  This package contains the bindings for the Python language."
 
+revision=1
+pycompile_module="exo-0.6 pyexo"
+
 Add_dependency run glibc
 Add_dependency run atk
 Add_dependency run glib
diff --git a/srcpkgs/gamin/gamin-python.template b/srcpkgs/gamin/gamin-python.template
index a95f25a85d..f6b58cf65b 100644
--- a/srcpkgs/gamin/gamin-python.template
+++ b/srcpkgs/gamin/gamin-python.template
@@ -5,6 +5,9 @@ long_desc="${long_desc}
 
  This package contains the python bindings."
 
+revision=1
+pycompile_module="."
+
 Add_dependency run glibc
 Add_dependency run gamin
 Add_dependency run python
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index 453f864772..f170e6cdf7 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,6 +1,7 @@
 # Template file for 'gedit'
 pkgname=gedit
 version=3.2.0
+revision=1
 distfiles="${GNOME_SITE}/gedit/3.2/gedit-$version.tar.xz"
 build_style=gnu_configure
 configure_args="--disable-schemas-compile --disable-scrollkeeper
@@ -13,6 +14,8 @@ checksum=a3f62b20816a3f902bb811cc14ae01111e27ce266e49d39f5854fd45b2895348
 long_desc="
  The GNOME Editor."
 
+pycompile_module="gi/overrides"
+pycompile_dirs="usr/lib/gedit/plugins"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="gedit-devel"
 
diff --git a/srcpkgs/gimp/gimp-python.template b/srcpkgs/gimp/gimp-python.template
index 37592beb42..c1137fff40 100644
--- a/srcpkgs/gimp/gimp-python.template
+++ b/srcpkgs/gimp/gimp-python.template
@@ -5,7 +5,8 @@ long_desc="${long_desc}
 
  This package contains the Python bindings."
 
-revision=1
+revision=2
+pycompile_dirs="usr/lib/gimp/2.0/python"
 
 Add_dependency run glibc
 Add_dependency run gimp
diff --git a/srcpkgs/git/git-python.template b/srcpkgs/git/git-python.template
index f52efa13a7..4fb7d69aee 100644
--- a/srcpkgs/git/git-python.template
+++ b/srcpkgs/git/git-python.template
@@ -5,7 +5,10 @@ long_desc="${long_desc}
 
  This package contains the Python bindings for GIT."
 
+revision=1
 noarch=yes
+pycompile_module="git_remote_helpers"
+
 Add_dependency run git
 Add_dependency run python
 
diff --git a/srcpkgs/glib/glib-devel.template b/srcpkgs/glib/glib-devel.template
index 3826e029a3..205fc3dd94 100644
--- a/srcpkgs/glib/glib-devel.template
+++ b/srcpkgs/glib/glib-devel.template
@@ -5,7 +5,8 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
+revision=2
+pycompile_dirs="usr/lib/gdbus-2.0/codegen"
 
 Add_dependency run glibc
 Add_dependency run zlib-devel
diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index 11ce37cf9d..e46411e944 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,6 +1,7 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.6
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/0.20/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-scrollkeeper --localstatedir=/var"
@@ -14,20 +15,17 @@ long_desc="
  XSLT stylesheets that were once distributed with Yelp."
 
 noarch=yes
+pycompile_module="xml2po"
+
 Add_dependency run libxslt
 Add_dependency full docbook-xml
 Add_dependency full docbook-xsl
 Add_dependency full rarian
 Add_dependency full python
 Add_dependency full libxml2-python
+
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gettext
 Add_dependency build libxslt-devel
 Add_dependency build gsettings-desktop-schemas
-
-post_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${DESTDIR}/usr/share/pkgconfig ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gnome-menus/template b/srcpkgs/gnome-menus/template
index ba33ebbaaa..8ed7aa17b7 100644
--- a/srcpkgs/gnome-menus/template
+++ b/srcpkgs/gnome-menus/template
@@ -1,6 +1,7 @@
 # Template file for 'gnome-menus'
 pkgname=gnome-menus
 version=3.2.0.1
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
 build_style=gnu_configure
 configure_args="--localstatedir=/var --disable-static"
@@ -12,6 +13,7 @@ long_desc="
  for the GNOME Desktop."
 
 subpackages="$pkgname-devel"
+pycompile_module="GMenuSimpleEditor"
 
 Add_dependency run glibc
 Add_dependency run glib
diff --git a/srcpkgs/gnome-tweak-tool/template b/srcpkgs/gnome-tweak-tool/template
index 1dba42db34..30d83ec578 100644
--- a/srcpkgs/gnome-tweak-tool/template
+++ b/srcpkgs/gnome-tweak-tool/template
@@ -1,6 +1,7 @@
 # Template file for 'gnome-tweak-tool'
 pkgname=gnome-tweak-tool
 version=3.2.0
+revision=1
 homepage="http://live.gnome.org/GnomeTweakTool"
 distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
 build_style=gnu_configure
@@ -13,6 +14,7 @@ long_desc="
  are hidden by default in GNOME3."
 
 noarch=yes
+pycompile_module="gtweak"
 
 Add_dependency run pygobject
 Add_dependency run desktop-file-utils
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 2e35ba3380..f3bcf7dd9e 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,6 +1,7 @@
 # Template file for 'gobject-introspection'
 pkgname=gobject-introspection
 version=1.30.0
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/1.30/$pkgname-$version.tar.xz"
 build_style=gnu_configure
 configure_args="--disable-tests"
@@ -14,6 +15,7 @@ long_desc="
  a uniform, machine readable format."
 
 subpackages="gir-freedesktop libgirepository libgirepository-devel"
+pycompile_dirs="usr/lib/$pkgname/giscanner"
 
 Add_dependency run glibc
 Add_dependency run libffi
diff --git a/srcpkgs/gst-python/template b/srcpkgs/gst-python/template
index 45b4e7e839..9ea0c82015 100644
--- a/srcpkgs/gst-python/template
+++ b/srcpkgs/gst-python/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-python'.
 pkgname=gst-python
 version=0.10.21
-revision=1
+revision=2
 distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Python bindings for GStreamer 0.10"
@@ -11,6 +11,8 @@ long_desc="
  This package provides the Python language bindings for the GStreamer 0.10
  multimedia framework."
 
+pycompile_module="gst-0.10"
+
 Add_dependency run glibc
 Add_dependency run glib
 Add_dependency run python
diff --git a/srcpkgs/libcap-ng/libcap-ng-python.template b/srcpkgs/libcap-ng/libcap-ng-python.template
index 815b485f80..680c7b47aa 100644
--- a/srcpkgs/libcap-ng/libcap-ng-python.template
+++ b/srcpkgs/libcap-ng/libcap-ng-python.template
@@ -5,6 +5,9 @@ long_desc="${long_desc}
 
  This package contains the python language bindings."
 
+revision=1
+pycompile_module="capng"
+
 Add_dependency run glibc
 Add_dependency run python
 Add_dependency run libcap-ng
diff --git a/srcpkgs/libgsf/libgsf-python.template b/srcpkgs/libgsf/libgsf-python.template
index d55355066c..d9f614fbc3 100644
--- a/srcpkgs/libgsf/libgsf-python.template
+++ b/srcpkgs/libgsf/libgsf-python.template
@@ -5,6 +5,9 @@ long_desc="${long_desc}
 
  This package contains the Python bindings."
 
+revision=1
+pycompile_module="gsf"
+
 Add_dependency run glibc
 Add_dependency run zlib
 Add_dependency run bzip2
diff --git a/srcpkgs/libpeas/libpeas-devel.template b/srcpkgs/libpeas/libpeas-devel.template
index 0532363a6f..dd61166107 100644
--- a/srcpkgs/libpeas/libpeas-devel.template
+++ b/srcpkgs/libpeas/libpeas-devel.template
@@ -5,7 +5,9 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
+revision=2
+
+pycompile_dirs="usr/lib/peas-demo/plugins/pythonhello"
 
 Add_dependency run glibc
 Add_dependency run glib
diff --git a/srcpkgs/llvm/clang-analyzer.template b/srcpkgs/llvm/clang-analyzer.template
index 241ad483fe..ed7a9bc096 100644
--- a/srcpkgs/llvm/clang-analyzer.template
+++ b/srcpkgs/llvm/clang-analyzer.template
@@ -13,7 +13,10 @@ long_desc="
  rest of Clang, the analyzer is implemented as a C++ library that can be used
  by other tools and applications."
 
+revision=1
 noarch=yes
+pycompile_dirs="usr/lib/clang-analyzer"
+
 Add_dependency run clang
 Add_dependency run python
 Add_dependency run perl
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index a36db2a355..101322a57f 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -1,6 +1,7 @@
 # Template file for 'mercurial'
 pkgname=mercurial
 version=1.8.4
+revision=1
 distfiles="http://mercurial.selenic.com/release/$pkgname-$version.tar.gz"
 build_style=python-module
 short_desc="Fast, lightweight source control management system"
@@ -48,6 +49,8 @@ long_desc="
         * Source code available under the GPL license
         * Actively community supported and developed"
 
+pycompile_module="$pkgname hgext"
+
 Add_dependency run glibc
 Add_dependency run python
 Add_dependency build gettext
diff --git a/srcpkgs/notify-python/template b/srcpkgs/notify-python/template
index 1698e92312..7439d69966 100644
--- a/srcpkgs/notify-python/template
+++ b/srcpkgs/notify-python/template
@@ -1,7 +1,7 @@
 # Template file for 'notify-python'
 pkgname=notify-python
 version=0.1.1
-revision=4
+revision=5
 patch_args="-Np1"
 distfiles="http://www.galago-project.org/files/releases/source/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
@@ -16,6 +16,8 @@ long_desc="
 
  $pkgname provides just the Python bindings for libnotify."
 
+pycompile_module="gtk-2.0/pynotify"
+
 Add_dependency run glibc
 Add_dependency run libnotify
 Add_dependency run gtk+
diff --git a/srcpkgs/papyon/template b/srcpkgs/papyon/template
index 4319b95e52..f369c48346 100644
--- a/srcpkgs/papyon/template
+++ b/srcpkgs/papyon/template
@@ -1,6 +1,7 @@
 # Template file for 'papyon'
 pkgname=papyon
 version=0.5.4
+revision=1
 distfiles="http://www.freedesktop.org/software/papyon/releases/papyon-${version}.tar.gz"
 build_style=python-module
 short_desc="MSN library purely written in Python"
@@ -25,6 +26,8 @@ long_desc="
   - Solid networking through a new sublibrary : gnet"
 
 noarch=yes
+pycompile_module="$pkgname tests"
+
 Add_dependency full python
 Add_dependency full pygobject
 Add_dependency full pyopenssl
diff --git a/srcpkgs/pyatspi/template b/srcpkgs/pyatspi/template
index ae7463b082..2f5b14c687 100644
--- a/srcpkgs/pyatspi/template
+++ b/srcpkgs/pyatspi/template
@@ -1,6 +1,7 @@
 # Template file for 'pyatspi'
 pkgname=pyatspi
 version=2.2.0
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/2.2/$pkgname-$version.tar.xz"
 build_style=gnu_configure
 short_desc="Python bindings for AT-SPI"
@@ -11,7 +12,9 @@ checksum=1880ddc8d8a1bcf87bab48e7227065f51925eee3d557b0b446ba84c3ca85b740
 long_desc="
  This packages the Python language bindings for AT-SPI."
 
+pycompile_module="$pkgname"
 noarch=yes
+
 Add_dependency run at-spi2-core
 Add_dependency run pygobject
 Add_dependency build at-spi2-core-devel
diff --git a/srcpkgs/pycairo/template b/srcpkgs/pycairo/template
index 0880fbe6a7..7dbd15ae64 100644
--- a/srcpkgs/pycairo/template
+++ b/srcpkgs/pycairo/template
@@ -1,7 +1,7 @@
 # Template file for 'pycairo'
 pkgname=pycairo
 version=1.8.8
-revision=3
+revision=4
 distfiles="http://cairographics.org/releases/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 short_desc="Python bindings for the cairo graphics library"
@@ -10,6 +10,7 @@ checksum=2f52599943ca03c8ff336a0e84b1c8b74f30e2a3de9cb6a9a42a93a848832860
 long_desc="
  Pycairo is a set of Python bindings for the cairo graphics library."
 
+pycompile_module="cairo"
 subpackages="$pkgname-devel"
 
 Add_dependency run glibc
diff --git a/srcpkgs/pycrypto/template b/srcpkgs/pycrypto/template
index aaac0a554f..c9484be3af 100644
--- a/srcpkgs/pycrypto/template
+++ b/srcpkgs/pycrypto/template
@@ -1,6 +1,7 @@
 # Template file for 'pycrypto'
 pkgname=pycrypto
 version=2.3
+revision=1
 distfiles="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/$pkgname-$version.tar.gz"
 build_style=python-module
 short_desc="The Python Cryptography Toolkit"
@@ -10,6 +11,8 @@ long_desc="
  The Python cryptography toolkit is intended to provide a reliable and stable
  base for writing Python programs that require cryptographic functions."
 
+pycompile_module="Crypto"
+
 Add_dependency run glibc
 Add_dependency run gmp
 Add_dependency run python
diff --git a/srcpkgs/pycurl/template b/srcpkgs/pycurl/template
index a3c492836e..1f980e21d4 100644
--- a/srcpkgs/pycurl/template
+++ b/srcpkgs/pycurl/template
@@ -1,6 +1,7 @@
 # Template file for 'pycurl'
 pkgname=pycurl
 version=7.19.0
+revision=1
 distfiles="http://pycurl.sourceforge.net/download/${pkgname}-${version}.tar.gz"
 build_style=python-module
 short_desc="Python interface to the CURL library"
@@ -11,6 +12,8 @@ long_desc="
  identified by a URL from a Python program, similar to the urllib Python
  module. PycURL is mature, very fast, and supports a lot of features."
 
+pycompile_module="curl"
+
 Add_dependency run glibc
 Add_dependency run libssl
 Add_dependency run libcurl
diff --git a/srcpkgs/pygobject/template b/srcpkgs/pygobject/template
index ed43411248..5cbb4beb36 100644
--- a/srcpkgs/pygobject/template
+++ b/srcpkgs/pygobject/template
@@ -1,6 +1,7 @@
 # Template file for 'pygobject'
 pkgname=pygobject
 version=3.0.1
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.xz"
 build_style=gnu_configure
 short_desc="Python bindings for GObject"
@@ -11,6 +12,7 @@ checksum=ccb2cc765c11724fd3025569a7a7a72bf7c981365107ff5bd15499640d6adda1
 long_desc="
  Pygobject is a set of Python bindings for the GLib's GObject library."
 
+pycompile_module="gi"
 subpackages="$pkgname-devel"
 
 Add_dependency run glibc
diff --git a/srcpkgs/pygobject2/pygobject2-devel.template b/srcpkgs/pygobject2/pygobject2-devel.template
index 40d1b06914..9078dc6405 100644
--- a/srcpkgs/pygobject2/pygobject2-devel.template
+++ b/srcpkgs/pygobject2/pygobject2-devel.template
@@ -5,7 +5,8 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
+revision=2
+pycompile_module="usr/share/pygobject/2.0/codegen"
 replaces="pygobject-devel<3.0.0"
 
 Add_dependency run libffi-devel
diff --git a/srcpkgs/pygobject2/template b/srcpkgs/pygobject2/template
index 2d2dab6ff8..65c2be4959 100644
--- a/srcpkgs/pygobject2/template
+++ b/srcpkgs/pygobject2/template
@@ -1,7 +1,7 @@
 # Template file for 'pygobject2'
 pkgname=pygobject2
 version=2.28.6
-revision=1
+revision=2
 wrksrc=${pkgname%2}-${version}
 distfiles="${GNOME_SITE}/${pkgname%2}/2.28/${pkgname%2}-$version.tar.xz"
 build_style=gnu_configure
@@ -15,6 +15,7 @@ long_desc="
  Pygobject is a set of Python bindings for the GLib's GObject library,
  version 2."
 
+pycompile_module="glib gobject gtk-2.0 pygtk"
 replaces="pygobject<3.0.0"
 subpackages="$pkgname-devel"
 
diff --git a/srcpkgs/pygtk/pygtk-devel.template b/srcpkgs/pygtk/pygtk-devel.template
index e29b2b258e..7b201b39dd 100644
--- a/srcpkgs/pygtk/pygtk-devel.template
+++ b/srcpkgs/pygtk/pygtk-devel.template
@@ -5,6 +5,9 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+pycompile_module="demos ."
+
 Add_dependency run python-devel
 Add_dependency run gtk+-devel
 Add_dependency run pygobject2-devel
diff --git a/srcpkgs/pygtk/template b/srcpkgs/pygtk/template
index ece8bea561..38d72cddfd 100644
--- a/srcpkgs/pygtk/template
+++ b/srcpkgs/pygtk/template
@@ -1,6 +1,7 @@
 # Template file for 'pygtk'
 pkgname=pygtk
 version=2.24.0
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/2.24/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Python bindings for the GTK+ toolkit"
@@ -9,6 +10,7 @@ checksum=cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912
 long_desc="
  Pygtk is a set of Python bindings for the GTK+ toolkit."
 
+pycompile_module="gtk-2.0/gtk"
 subpackages="pygtk-devel"
 
 # XXX: missing python-numpy build dep
diff --git a/srcpkgs/pyopenssl/template b/srcpkgs/pyopenssl/template
index e848a09285..9f58be7c57 100644
--- a/srcpkgs/pyopenssl/template
+++ b/srcpkgs/pyopenssl/template
@@ -1,6 +1,7 @@
 # Template file for 'pyopenssl'
 pkgname=pyopenssl
 version=0.11
+revision=1
 wrksrc="pyOpenSSL-${version}"
 distfiles="http://launchpad.net/pyopenssl/main/0.11/+download/pyOpenSSL-${version}.tar.gz"
 build_style=python-module
@@ -12,6 +13,8 @@ long_desc="
  as transport layer. The Connection object wraps all the socket methods and
  can therefore be used interchangeably."
 
+pycompile_module="OpenSSL"
+
 Add_dependency run glibc
 Add_dependency run libssl
 Add_dependency run python
diff --git a/srcpkgs/pysqlite/template b/srcpkgs/pysqlite/template
index e4a161cbe6..797c3dd7a9 100644
--- a/srcpkgs/pysqlite/template
+++ b/srcpkgs/pysqlite/template
@@ -1,6 +1,7 @@
 # Template file for 'pysqlite'
 pkgname=pysqlite
 version=2.6.0
+revision=1
 distfiles="http://pysqlite.googlecode.com/files/${pkgname}-${version}.tar.gz"
 build_style=python-module
 short_desc="DB-API 2.0 interface for SQLite databases"
@@ -9,6 +10,8 @@ checksum=555834d7def68a7fddf3c89eb7d66980b8a0d5dc9327705f5c752e78b4e35879
 long_desc="
  A SQLite binding for Python that complies to the Database API 2.0."
 
+pycompile_module="pysqlite2"
+
 Add_dependency run glibc
 Add_dependency run sqlite
 Add_dependency run python
diff --git a/srcpkgs/python-MarkupSafe/template b/srcpkgs/python-MarkupSafe/template
index 6182819e42..db0d565a90 100644
--- a/srcpkgs/python-MarkupSafe/template
+++ b/srcpkgs/python-MarkupSafe/template
@@ -1,6 +1,7 @@
 # Template file for 'python-MarkupSafe'
 pkgname=python-MarkupSafe
 version=0.11
+revision=1
 wrksrc="MarkupSafe-${version}"
 distfiles="http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${version}.tar.gz"
 build_style=python-module
@@ -11,6 +12,8 @@ long_desc="
  MarkupSafe implements a unicode subclass that supports HTML strings
  for Python."
 
+pycompile_module="markupsafe"
+
 Add_dependency run glibc
 Add_dependency full python
 Add_dependency build python-distribute
diff --git a/srcpkgs/python-distribute/template b/srcpkgs/python-distribute/template
index bce84e8bd7..596fc6feb3 100644
--- a/srcpkgs/python-distribute/template
+++ b/srcpkgs/python-distribute/template
@@ -1,15 +1,18 @@
 # Template file for 'python-distribute'
 pkgname=python-distribute
 version=0.6.14
+revision=1
 wrksrc="distribute-${version}"
 patch_args="-Np1"
 distfiles="http://pypi.python.org/packages/source/d/distribute/distribute-$version.tar.gz"
 build_style=python-module
 short_desc="A collection of extensions to the Python distutils"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=16d5da8211d74eb11f2744c5945a3c7fcae9abbfebb56ea493f177a45d2e5bec
+checksum=44c92b7edbc0ff9cd5847291e7dcb4cc75e24247a306bd4b8a139abd355b0db0
 long_desc="
  Extensions to the python-distutils for large or complex distributions."
 
+pycompile_module="setuptools pkg_resources easy_install site"
 noarch=yes 
+
 Add_dependency full python
diff --git a/srcpkgs/python-jinja/template b/srcpkgs/python-jinja/template
index 78afdaea2b..af80790df0 100644
--- a/srcpkgs/python-jinja/template
+++ b/srcpkgs/python-jinja/template
@@ -1,7 +1,7 @@
 # Template file for 'python-jinja'
 pkgname=python-jinja
 version=2.5.5
-revision=1
+revision=2
 wrksrc="Jinja2-${version}"
 distfiles="http://pypi.python.org/packages/source/J/Jinja2/Jinja2-${version}.tar.gz"
 build_style=python-module
@@ -20,7 +20,9 @@ long_desc="
       line in the template.
     * configurable syntax"
 
+pycompile_module="jinja2"
 noarch=yes
+
 Add_dependency full python
 Add_dependency full python-MarkupSafe
 Add_dependency full python-distribute
diff --git a/srcpkgs/python-urwid/template b/srcpkgs/python-urwid/template
index 6ce175d24b..0ee1aed3d4 100644
--- a/srcpkgs/python-urwid/template
+++ b/srcpkgs/python-urwid/template
@@ -1,7 +1,7 @@
 # Template file for 'python-urwid'
 pkgname=python-urwid
 version=0.9.9
-revision=1
+revision=2
 wrksrc="urwid-${version}"
 distfiles="http://excess.org/urwid/urwid-$version.tar.gz"
 build_style=python-module
@@ -26,6 +26,8 @@ long_desc="
   Customizable layout for all widgets
   Easy interface for creating HTML screen shots"
 
+pycompile_module="urwid"
+
 Add_dependency run glibc
 Add_dependency run python
 Add_dependency build python-devel
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 7958dba84a..707e316cdf 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -1,7 +1,7 @@
 # Template build file for 'python'.
 pkgname=python
 version=2.7.2
-revision=2
+revision=3
 patch_args="-Np1"
 wrksrc="Python-$version"
 distfiles="http://www.python.org/ftp/python/$version/Python-$version.tar.bz2"
@@ -24,6 +24,7 @@ long_desc="
  adaptable as an extension language for existing applications."
 
 stow_copy=yes
+pycompile_dirs="usr/lib/python2.7"
 subpackages="$pkgname-devel"
 
 Add_dependency run glibc
diff --git a/srcpkgs/scons/template b/srcpkgs/scons/template
index 60a59c8ef1..680c4b197a 100644
--- a/srcpkgs/scons/template
+++ b/srcpkgs/scons/template
@@ -1,6 +1,7 @@
 # Template file for 'scons'
 pkgname=scons
 version=2.0.1
+revision=1
 distfiles="http://prdownloads.sourceforge.net/$pkgname/$pkgname-$version.tar.gz"
 build_style=python-module
 short_desc="SCons, a software construction tool"
@@ -10,11 +11,13 @@ license="MIT"
 checksum=0a8151da41c4a26c776c84f44f747ce03e093d43be3e83b38c14a76ab3256762
 long_desc="
  SCons is a software construction tool—that is, a superior alternative to the
- classic "Make" build tool that we all know and love.
+ classic Make build tool that we all know and love.
 
  SCons is implemented as a Python script and set of modules, and SCons
- 'configuration files' are actually executed as Python scripts. This gives
+ configuration files are actually executed as Python scripts. This gives
  SCons many powerful capabilities not found in other software build tools."
 
+pycompile_dirs="usr/lib/scons-$version/SCons"
+
 Add_dependency run python
 Add_dependency build python
diff --git a/srcpkgs/subversion/subversion-python.template b/srcpkgs/subversion/subversion-python.template
index 04f0dfa198..94e95dc351 100644
--- a/srcpkgs/subversion/subversion-python.template
+++ b/srcpkgs/subversion/subversion-python.template
@@ -5,6 +5,9 @@ long_desc="${long_desc}
 
  This package contains the Python language bindings for subversion."
 
+revision=1
+pycompile_module="libsvn svn"
+
 Add_dependency run glibc
 Add_dependency run libuuid
 Add_dependency run libldap
diff --git a/srcpkgs/telepathy-butterfly/template b/srcpkgs/telepathy-butterfly/template
index 14bb6441c3..f6a6691016 100644
--- a/srcpkgs/telepathy-butterfly/template
+++ b/srcpkgs/telepathy-butterfly/template
@@ -1,6 +1,7 @@
 # Template file for 'telepathy-butterfly'
 pkgname=telepathy-butterfly
 version=0.5.15
+revision=1
 distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 short_desc="A MSN connection manager for Telepathy"
@@ -12,7 +13,9 @@ long_desc="
  differences between protocols to provide a unified interface for
  applications."
 
+pycompile_module="butterfly"
 noarch=yes
+
 Add_dependency full python
 Add_dependency full papyon
 Add_dependency full telepathy-python
diff --git a/srcpkgs/telepathy-python/template b/srcpkgs/telepathy-python/template
index ca656d0e7a..f96249494a 100644
--- a/srcpkgs/telepathy-python/template
+++ b/srcpkgs/telepathy-python/template
@@ -1,6 +1,7 @@
 # Template file for 'telepathy-python'
 pkgname=telepathy-python
 version=0.15.19
+revision=1
 distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 short_desc="Python libraries for use in Telepathy clients and connection managers"
@@ -12,7 +13,9 @@ long_desc="
  differences between protocols to provide a unified interface for
  applications."
 
+pycompile_module="telepathy"
 noarch=yes
+
 Add_dependency build libxslt
 Add_dependency full python
 Add_dependency full dbus-python
diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index 8db1fa7f44..1c7cc93ef5 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -1,7 +1,7 @@
 # Template file for 'totem'
 pkgname=totem
 version=3.2.0
-revision=1
+revision=2
 distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
 build_style=gnu_configure
 configure_args="--disable-scrollkeeper --localstatedir=/var --disable-static
@@ -37,6 +37,7 @@ long_desc="
 # XXX xulrunner plugin.
 subpackages="totem-devel totem-mozilla-plugin"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
+pycompile_dirs="usr/lib/totem/plugins"
 
 Add_dependency run libgcc
 Add_dependency run glibc
diff --git a/srcpkgs/ufw/template b/srcpkgs/ufw/template
index 1e04161dc9..678b9f0916 100644
--- a/srcpkgs/ufw/template
+++ b/srcpkgs/ufw/template
@@ -1,7 +1,7 @@
 # Template file for 'ufw'
 pkgname=ufw
 version=0.30.1
-revision=3
+revision=4
 distfiles="http://launchpad.net/ufw/0.30/$version/+download/$pkgname-$version.tar.gz"
 build_style=python-module
 short_desc="Uncomplicated Firewall"
@@ -15,6 +15,7 @@ long_desc="
  uncomplicated and easy to use."
 
 noarch=yes
+pycompile_module="ufw"
 conf_files="/etc/default/ufw /etc/ufw/ufw.conf"
 openrc_services="ufw default false"
 
diff --git a/srcpkgs/urlgrabber/template b/srcpkgs/urlgrabber/template
index 08fb05015e..5d1c20d533 100644
--- a/srcpkgs/urlgrabber/template
+++ b/srcpkgs/urlgrabber/template
@@ -1,6 +1,7 @@
 # Template file for 'urlgrabber'
 pkgname=urlgrabber
 version=3.9.1
+revision=1
 distfiles="http://urlgrabber.baseurl.org/download/$pkgname-$version.tar.gz"
 build_style=python-module
 short_desc="A high-level cross-protocol url-grabber and Python library"
@@ -16,5 +17,7 @@ long_desc="
  your program is written to do!"
 
 noarch=yes
+pycompile_module="$pkgname"
+
 Add_dependency full python ">=0"
 Add_dependency full pycurl
diff --git a/srcpkgs/wicd/template b/srcpkgs/wicd/template
index e83ff56515..af3b1af292 100644
--- a/srcpkgs/wicd/template
+++ b/srcpkgs/wicd/template
@@ -1,7 +1,7 @@
 # Template file for 'wicd'
 pkgname=wicd
 version=1.7.0
-revision=2
+revision=3
 patch_args="-Np1"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 build_style=custom-install
@@ -34,6 +34,7 @@ conf_files="
 /etc/wicd/encryption/templates/active"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 openrc_services="wicd default false"
+pycompile_module="wicd"
 
 Add_dependency full dbus-python
 Add_dependency full pygtk
diff --git a/srcpkgs/xcb-proto/template b/srcpkgs/xcb-proto/template
index 5168cbe898..202a833e30 100644
--- a/srcpkgs/xcb-proto/template
+++ b/srcpkgs/xcb-proto/template
@@ -1,6 +1,7 @@
 # Template build for 'xcb-proto'.
 pkgname=xcb-proto
 version=1.6
+revision=1
 distfiles="http://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="XML-XCB (X C Bindings) protocol descriptions"
@@ -26,5 +27,7 @@ long_desc="
  used by Python code generators in individual language bindings."
 
 noarch=yes
-Add_dependency build python
+pycompile_module="xcbgen"
+
+Add_dependency full python
 Add_dependency build libxml2
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index 4938ef68c3..8d109c7691 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,6 +1,7 @@
 # Template file for 'xen'
 pkgname=xen
 version=4.1.1
+revision=1
 wrksrc=xen-${version}
 distfiles="http://bits.xensource.com/oss-xen/release/$version/xen-$version.tar.gz"
 build_style=custom-install
@@ -16,6 +17,7 @@ long_desc="
 broken_as_needed=yes
 nostrip=yes
 
+pycompile_module="xen grub"
 subpackages="xen-devel"
 openrc_services="xend default true"
 
diff --git a/srcpkgs/xmldiff/template b/srcpkgs/xmldiff/template
index 253403f403..c4cdd596c9 100644
--- a/srcpkgs/xmldiff/template
+++ b/srcpkgs/xmldiff/template
@@ -1,6 +1,7 @@
 # Template file for 'xmldiff'
 pkgname=xmldiff
 version=0.6.10
+revision=1
 distfiles="http://ftp.logilab.org/pub/$pkgname/$pkgname-$version.tar.gz"
 build_style=python-module
 short_desc="Python classes to diff XML files"
@@ -11,6 +12,8 @@ long_desc="
  A python tool that figures out the differences between two similar XML files,
  in the same way the diff(1) utility does it."
 
+pycompile_module="${pkgname}"
+
 Add_dependency run glibc
 Add_dependency run python
 Add_dependency run libxslt
diff --git a/srcpkgs/zope.interface/template b/srcpkgs/zope.interface/template
index 087d91d2ce..db3645d48f 100644
--- a/srcpkgs/zope.interface/template
+++ b/srcpkgs/zope.interface/template
@@ -1,6 +1,7 @@
 # Template file for 'zope.interface'
 pkgname=zope.interface
 version=3.5.3
+revision=1
 distfiles="http://pypi.python.org/packages/source/z/${pkgname}/${pkgname}-${version}.tar.gz"
 build_style=python-module
 short_desc="zope.interface package from Zope 3"
@@ -10,5 +11,7 @@ long_desc="
  This is a separate distribution of the zope.interface package used in Zope 3,
  along with the packages it depends on."
 
+pycompile_module="zope"
 noarch=yes
+
 Add_dependency full python