diff --git a/PKGBUILD b/PKGBUILD
index 327961b..64b4402 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -39,8 +39,8 @@ package() {
 	install -Dm644 minecraftd.service           "${pkgdir}/usr/lib/systemd/system/${_game}d.service"
 	install -Dm644 minecraftd-backup.service    "${pkgdir}/usr/lib/systemd/system/${_game}d-backup.service"
 	install -Dm644 minecraftd-backup.timer      "${pkgdir}/usr/lib/systemd/system/${_game}d-backup.timer"
-	install -Dm644 minecraft_server.${pkgver}.jar "${pkgdir}/srv/minecraft/minecraft_server.${pkgver}.jar"
-	ln -s "minecraft_server.${pkgver}.jar" "${pkgdir}/srv/minecraft/minecraft_server.jar"
+	install -Dm644 minecraft_server.${pkgver}.jar "${pkgdir}${_server_root}/minecraft_server.${pkgver}.jar"
+	ln -s "minecraft_server.${pkgver}.jar" "${pkgdir}${_server_root}/minecraft_server.jar"
 
 	# Link the log files
 	mkdir -p "${pkgdir}/var/log/"
diff --git a/minecraft-server.install b/minecraft-server.install
index f420f55..fc42dcd 100644
--- a/minecraft-server.install
+++ b/minecraft-server.install
@@ -28,7 +28,7 @@ post_install() {
 post_upgrade() {
 	chown -R ${_user}:${_user} "${_server_root}"
 
-	if [[ -f /etc/conf.d/${_game}.pacnew ]]; then
+	if [[ -f /etc/conf.d/${_game}.pacnew ]]; then    # TODO: remove oneday
 		echo -e "\e[34;1m==>\e[39;1m NOTE: There was a new change on how backup files are handled! Unfortunately this makes \e[0m"
 		echo -e "\e[34;1m==>\e[39;1m old backups incompatible with the newly implemeted restore feature. Bare in mind that no data is lost \e[0m"
 		echo -e "\e[34;1m==>\e[39;1m neither are those backups useless. They just will not work with the restore capability of the management script. \e[0m"