--- ./installer.sh.orig	2012-04-27 00:10:12.000000000 +0200
+++ ./installer.sh	2012-07-03 23:56:30.000000000 +0200
@@ -392,7 +392,7 @@
 	RKHINST_ETC_DIR="${SYSCONFIGDIR}"
 	RKHINST_BIN_DIR="${BINDIR}"
 	RKHINST_SCRIPT_DIR="${LIBDIR}/${APPNAME}/scripts"
-	RKHINST_MAN_DIR="${SHAREDIR}/man/man8"
+	RKHINST_MAN_DIR="${PREFIX}/man/man8"
 
 	if [ "${RKHINST_LAYOUT}" = "oldschool" ]; then
 		RKHINST_DB_DIR="${VARDIR}/${APPNAME}/db"
@@ -406,12 +406,12 @@
 	elif [ "${RKHINST_LAYOUT}" = "TXZ" ]; then
 		RKHINST_DB_DIR="${VARDIR}/lib/${APPNAME}/db"
 		RKHINST_TMP_DIR="${VARDIR}/lib/${APPNAME}/tmp"
-		RKHINST_DOC_DIR="${PREFIX}/doc/${APPNAME}-${APPVERSION}"
+		RKHINST_DOC_DIR="${PREFIX}/doc/${APPNAME}"
 		RKHINST_MAN_DIR="${PREFIX}/man/man8"
 	else
 		RKHINST_DB_DIR="${VARDIR}/lib/${APPNAME}/db"
 		RKHINST_TMP_DIR="${VARDIR}/lib/${APPNAME}/tmp"
-		RKHINST_DOC_DIR="${SHAREDIR}/doc/${APPNAME}-${APPVERSION}"
+		RKHINST_DOC_DIR="${SHAREDIR}/doc/${APPNAME}"
 	fi
 
 	RKHINST_LANG_DIR="${RKHINST_DB_DIR}/i18n"
@@ -1076,22 +1076,6 @@
 		fi
 	done
 
-
-	# Application
-	for FILE in ${RKHINST_BIN_FILES}; do
-		if [ -f "${RKHINST_BIN_DIR}/${FILE}" ]; then
-			rm -f "${RKHINST_BIN_DIR}/${FILE}" >/dev/null 2>&1
-			ERRCODE=$?
-
-			if [ $ERRCODE -eq 0 ]; then
-				echo " Removing ${RKHINST_BIN_DIR}/${FILE}: OK"
-			else
-				echo " Removing ${RKHINST_BIN_DIR}/${FILE}: FAILED: Code $ERRCODE"
-			fi
-		fi
-	done
-
-
 	# Configuration file
 	for FILE in ${RKHINST_ETC_FILE}; do
 		if [ -f "${RKHINST_ETC_DIR}/${FILE}" ]; then