diff --git a/Makefile b/Makefile
index a8d525290..8e90bacf1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-NAME = phusion/baseimage
+NAME = id3as/phusion-baseimage
 VERSION = 0.9.16
 
 .PHONY: all build test tag_latest release ssh
diff --git a/image/Dockerfile b/image/Dockerfile
index 4571e5cc3..d7711bcd5 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM ubuntu:12.04
 MAINTAINER Phusion <info@phusion.nl>
 
 ENV HOME /root
diff --git a/image/prepare.sh b/image/prepare.sh
index 3c2baacd5..51124846a 100755
--- a/image/prepare.sh
+++ b/image/prepare.sh
@@ -36,6 +36,7 @@ ln -sf /bin/true /usr/bin/ischroot
 $minimal_apt_get_install apt-transport-https ca-certificates
 
 ## Install add-apt-repository
+$minimal_apt_get_install python3
 $minimal_apt_get_install software-properties-common
 
 ## Upgrade all packages.