diff --git a/srcpkgs/python-boto/template b/srcpkgs/python-boto/template
index 7c3baa64436..89ec19caafa 100644
--- a/srcpkgs/python-boto/template
+++ b/srcpkgs/python-boto/template
@@ -1,67 +1,71 @@
 # Template file for 'python-boto'
 pkgname=python-boto
 version=2.48.0
-revision=1
-wrksrc=${pkgname/python-//}-${version}
-build_style=python-module
-hostmakedepends="python python-setuptools python3 python3-setuptools"
-depends="python"
+revision=2
 noarch=yes
+wrksrc="boto-${version}"
+build_style=python-module
+pycompile_module="boto"
+hostmakedepends="python-setuptools python3-setuptools"
+depends="python"
 short_desc="Python interface to Amazon Web Services (Python2)"
 maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
 license="MIT"
-homepage="http://docs.pythonboto.org/en/latest/"
+homepage="http://docs.pythonboto.org/"
 distfiles="https://github.com/boto/boto/archive/$version.tar.gz"
 checksum=60aaf9f69eb033742fae4332462fac527e56df7b52b407af7866835abfa2a99e
-alternatives="boto:kill_instance:/usr/bin/kill_instance2
- boto:cfadmin:/usr/bin/cfadmin2
- boto:bundle_image:/usr/bin/bundle_image2
- boto:pyami_sendmail:/usr/bin/pyami_sendmail2
- boto:elbadmin:/usr/bin/elbadmin2
+alternatives="
  boto:asadmin:/usr/bin/asadmin2
+ boto:bundle_image:/usr/bin/bundle_image2
+ boto:cfadmin:/usr/bin/cfadmin2
+ boto:cq:/usr/bin/cq2
+ boto:cwutil:/usr/bin/cwutil2
+ boto:dynamodb_dump:/usr/bin/dynamodb_dump2
+ boto:dynamodb_load:/usr/bin/dynamodb_load2
+ boto:elbadmin:/usr/bin/elbadmin2
+ boto:fetch_file:/usr/bin/fetch_file2
  boto:glacier:/usr/bin/glacier2
  boto:instance_events:/usr/bin/instance_events2
- boto:fetch_file:/usr/bin/fetch_file2
- boto:taskadmin:/usr/bin/taskadmin2
- boto:sdbadmin:/usr/bin/sdbadmin2
- boto:dynamodb_dump:/usr/bin/dynamodb_dump2
- boto:cq:/usr/bin/cq2
- boto:mturk:/usr/bin/mturk2
+ boto:kill_instance:/usr/bin/kill_instance2
  boto:launch_instance:/usr/bin/launch_instance2
- boto:dynamodb_load:/usr/bin/dynamodb_load2
- boto:cwutil:/usr/bin/cwutil2
  boto:list_instances:/usr/bin/list_instances2
- boto:s3put:/usr/bin/s3put2"
+ boto:mturk:/usr/bin/mturk2
+ boto:pyami_sendmail:/usr/bin/pyami_sendmail2
+ boto:s3put:/usr/bin/s3put2
+ boto:sdbadmin:/usr/bin/sdbadmin2
+ boto:taskadmin:/usr/bin/taskadmin2"
 
 post_install() {
 	vlicense LICENSE
 }
 
-
 python3-boto_package() {
 	noarch=yes
-	depends=python3
+	depends="python3"
+	pycompile_module="boto"
 	short_desc="${short_desc/Python2/Python3}"
-	alternatives="boto:kill_instance:/usr/bin/kill_instance2
-		boto:cfadmin:/usr/bin/cfadmin2
-		boto:bundle_image:/usr/bin/bundle_image2
-		boto:pyami_sendmail:/usr/bin/pyami_sendmail2
-		boto:elbadmin:/usr/bin/elbadmin2
-		boto:asadmin:/usr/bin/asadmin2
-		boto:glacier:/usr/bin/glacier2
-		boto:instance_events:/usr/bin/instance_events2
-		boto:fetch_file:/usr/bin/fetch_file2
-		boto:taskadmin:/usr/bin/taskadmin2
-		boto:sdbadmin:/usr/bin/sdbadmin2
-		boto:dynamodb_dump:/usr/bin/dynamodb_dump2
-		boto:cq:/usr/bin/cq2
-		boto:mturk:/usr/bin/mturk2
-		boto:launch_instance:/usr/bin/launch_instance2
-		boto:dynamodb_load:/usr/bin/dynamodb_load2
-		boto:cwutil:/usr/bin/cwutil2
-		boto:list_instances:/usr/bin/list_instances2
-		boto:s3put:/usr/bin/s3put2"
+	alternatives="
+	 boto:asadmin:/usr/bin/asadmin3
+	 boto:bundle_image:/usr/bin/bundle_image3
+	 boto:cfadmin:/usr/bin/cfadmin3
+	 boto:cq:/usr/bin/cq3
+	 boto:cwutil:/usr/bin/cwutil3
+	 boto:dynamodb_dump:/usr/bin/dynamodb_dump3
+	 boto:dynamodb_load:/usr/bin/dynamodb_load3
+	 boto:elbadmin:/usr/bin/elbadmin3
+	 boto:fetch_file:/usr/bin/fetch_file3
+	 boto:glacier:/usr/bin/glacier3
+	 boto:instance_events:/usr/bin/instance_events3
+	 boto:kill_instance:/usr/bin/kill_instance3
+	 boto:launch_instance:/usr/bin/launch_instance3
+	 boto:list_instances:/usr/bin/list_instances3
+	 boto:mturk:/usr/bin/mturk3
+	 boto:pyami_sendmail:/usr/bin/pyami_sendmail3
+	 boto:s3put:/usr/bin/s3put3
+	 boto:sdbadmin:/usr/bin/sdbadmin3
+	 boto:taskadmin:/usr/bin/taskadmin3"
 	pkg_install() {
+		vmove usr/bin/*3
 		vmove usr/lib/python3*
 		vlicense LICENSE
 	}