diff --git a/games-action/minetest/minetest-0.4.12-r1.ebuild b/games-action/minetest/minetest-0.4.12-r2.ebuild
similarity index 94%
rename from games-action/minetest/minetest-0.4.12-r1.ebuild
rename to games-action/minetest/minetest-0.4.12-r2.ebuild
index c83d859..9f45d7f 100644
--- a/games-action/minetest/minetest-0.4.12-r1.ebuild
+++ b/games-action/minetest/minetest-0.4.12-r2.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit eutils cmake-utils gnome2-utils vcs-snapshot user
+inherit eutils cmake-utils gnome2-utils pax-utils vcs-snapshot user
 
 DESCRIPTION="An InfiniMiner/Minecraft inspired game"
 HOMEPAGE="http://minetest.net/"
@@ -113,10 +113,15 @@ src_install() {
 	cmake-utils_src_install
 
 	if use server || use dedicated ; then
+		pax-mark m "${D}"usr/bin/minetestserver
 		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
 		newconfd "${T}"/minetestserver.confd minetest-server
 	fi
 
+	if ! use dedicated ; then
+		pax-mark m "${D}"usr/bin/minetest
+	fi
+
 	if use doc ; then
 		cd "${CMAKE_BUILD_DIR}"/doc || die
 		dodoc -r html
diff --git a/games-action/minetest/minetest-0.4.13-r1.ebuild b/games-action/minetest/minetest-0.4.13-r2.ebuild
similarity index 95%
rename from games-action/minetest/minetest-0.4.13-r1.ebuild
rename to games-action/minetest/minetest-0.4.13-r2.ebuild
index bd6a935..b27dea3 100644
--- a/games-action/minetest/minetest-0.4.13-r1.ebuild
+++ b/games-action/minetest/minetest-0.4.13-r2.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit cmake-utils gnome2-utils vcs-snapshot user
+inherit cmake-utils gnome2-utils pax-utils vcs-snapshot user
 
 DESCRIPTION="An InfiniMiner/Minecraft inspired game"
 HOMEPAGE="http://minetest.net/"
@@ -113,10 +113,15 @@ src_install() {
 	cmake-utils_src_install
 
 	if use server || use dedicated ; then
+		pax-mark m "${D}"usr/bin/minetestserver
 		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
 		newconfd "${T}"/minetestserver.confd minetest-server
 	fi
 
+	if ! use dedicated ; then
+		pax-mark m "${D}"usr/bin/minetest
+	fi
+
 	if use doc ; then
 		cd "${CMAKE_BUILD_DIR}"/doc || die
 		dodoc -r html
diff --git a/games-action/minetest/minetest-0.5.0_rc.ebuild b/games-action/minetest/minetest-0.5.0_rc.ebuild
index 4c565f1..5bb8327 100644
--- a/games-action/minetest/minetest-0.5.0_rc.ebuild
+++ b/games-action/minetest/minetest-0.5.0_rc.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit cmake-utils gnome2-utils vcs-snapshot user
+inherit cmake-utils gnome2-utils pax-utils vcs-snapshot user
 
 DESCRIPTION="An InfiniMiner/Minecraft inspired game"
 HOMEPAGE="http://minetest.net/"
@@ -110,10 +110,15 @@ src_install() {
 	cmake-utils_src_install
 
 	if use server || use dedicated ; then
+		pax-mark m "${D}"usr/bin/minetestserver
 		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
 		newconfd "${T}"/minetestserver.confd minetest-server
 	fi
 
+	if ! use dedicated ; then
+		pax-mark m "${D}"usr/bin/minetest
+	fi
+
 	if use doc ; then
 		cd "${CMAKE_BUILD_DIR}"/doc || die
 		dodoc -r html
diff --git a/games-action/minetest/minetest-9999.ebuild b/games-action/minetest/minetest-9999.ebuild
index 7bf33dc..31a120f 100644
--- a/games-action/minetest/minetest-9999.ebuild
+++ b/games-action/minetest/minetest-9999.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils git-r3 gnome2-utils pax-utils user
 
 DESCRIPTION="An InfiniMiner/Minecraft inspired game"
 HOMEPAGE="http://minetest.net/"
-EGIT_REPO_URI="git://github.com/minetest/${PN}.git"
+EGIT_REPO_URI="https://github.com/minetest/${PN}.git"
 
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
 SLOT="0"