diff --git a/srcpkgs/python3.4/files/idle3.4.desktop b/srcpkgs/python3.4/files/idle3.4.desktop
new file mode 100644
index 00000000000..58eb6571393
--- /dev/null
+++ b/srcpkgs/python3.4/files/idle3.4.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=IDLE (using Python3.4)
+Comment=IDE for Python (using Python3.4)
+Exec=idle3.4
+Icon=idle3.4
+Terminal=false
+Type=Application
+Categories=Development;
+StartupNotify=true
diff --git a/srcpkgs/python3.4/files/idle3.xpm b/srcpkgs/python3.4/files/idle3.4.xpm
similarity index 100%
rename from srcpkgs/python3.4/files/idle3.xpm
rename to srcpkgs/python3.4/files/idle3.4.xpm
diff --git a/srcpkgs/python3.4/files/idle3.desktop b/srcpkgs/python3.4/files/idle3.desktop
deleted file mode 100644
index 57996c6ab1f..00000000000
--- a/srcpkgs/python3.4/files/idle3.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=IDLE 3 (using Python3.4)
-Comment=IDE for Python3.4
-Exec=idle3
-Icon=idle3
-Terminal=false
-Type=Application
-Categories=Development;
-StartupNotify=true
diff --git a/srcpkgs/python3.4/template b/srcpkgs/python3.4/template
index 44d15dcf581..aa03f220c93 100644
--- a/srcpkgs/python3.4/template
+++ b/srcpkgs/python3.4/template
@@ -1,7 +1,7 @@
 # Template file for 'python3.4'
 pkgname=python3.4
 version=3.4.4
-revision=3
+revision=4
 wrksrc="Python-${version}"
 short_desc="Interpreted, interactive, object-oriented programming language (${version%.*} series)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
@@ -18,8 +18,18 @@ makedepends="
  sqlite-devel bzip2-devel zlib-devel liblzma-devel tcl-devel tk-devel libX11-devel"
 depends="ca-certificates"
 
+alternatives="
+ python:idle:/usr/bin/idle3.4
+ python:idle3:/usr/bin/idle3.4
+ python:2to3:/usr/bin/2to3-3.4
+ python:pydoc:/usr/bin/pydoc3.4
+ python:pydoc3:/usr/bin/pydoc3.4
+ python:python:/usr/bin/python3.4
+ python:python3:/usr/bin/python3.4
+ python:python.1:/usr/share/man/man1/python3.4.1
+ python:python3.1:/usr/share/man/man1/python3.4.1"
+
 pre_configure() {
-	sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python3|" Lib/cgi.py
 	# Ensure that internal copies of zlib, expat and libffi are not used
 	rm -r Modules/zlib
 	rm -r Modules/expat
@@ -55,7 +65,9 @@ do_install() {
 	make DESTDIR=${DESTDIR} install maninstall
 	vlicense LICENSE
 
-	rm -f ${DESTDIR}/usr/bin/2to3{,-3.4}
+	rm -f ${DESTDIR}/usr/bin/2to3
+	rm -f ${DESTDIR}/usr/bin/{idle,pydoc,python}3
+	rm -f ${DESTDIR}/usr/share/man/man1/python3.1
 
 	ln -sf ../../libpython${version%.*}m.so \
 		${DESTDIR}/usr/lib/python${version%.*}/config-${version%.*}m/libpython${version%.*}m.so
@@ -107,9 +119,9 @@ idle-python3.4_package() {
 	depends="${sourcepkg}>=${version}_${revision} python3.4-tkinter"
 	short_desc+=" - IDE for Python${version%.*} using Tkinter"
 	pkg_install() {
-		vmove usr/bin/idle3*
+		vmove usr/bin/idle${version%.*}
 		vmove usr/lib/python${version%.*}/idlelib
-		vinstall ${FILESDIR}/idle3.xpm 644 usr/share/pixmaps
-		vinstall ${FILESDIR}/idle3.desktop 644 usr/share/applications
+		vinstall ${FILESDIR}/idle${version%.*}.xpm 644 usr/share/pixmaps
+		vinstall ${FILESDIR}/idle${version%.*}.desktop 644 usr/share/applications
 	}
 }