diff --git a/net-misc/openssh/patches/pathnames-haiku.h b/net-misc/openssh/patches/pathnames-haiku.h
index 76d7dc1c9..55ceb46f8 100644
--- a/net-misc/openssh/patches/pathnames-haiku.h
+++ b/net-misc/openssh/patches/pathnames-haiku.h
@@ -13,14 +13,14 @@
  */
 
 #define HAIKU_USER_SETTINGS_DIRECTORY	"/boot/home/config/settings"
-#define HAIKU_COMMON_ETC_DIRECTORY		"/boot/common/etc"
+#define HAIKU_COMMON_SETTINGS_DIRECTORY		"/boot/common/settings"
 #define HAIKU_COMMON_BIN_DIRECTORY		"/boot/common/bin"
 #define HAIKU_COMMON_VAR_DIRECTORY		"/boot/common/var"
 #define HAIKU_COMMON_SERVERS_DIRECTORY	"/boot/common/servers"
 #define HAIKU_SYSTEM_BIN_DIRECTORY		"/boot/system/bin"
 
 
-#define ETCDIR				HAIKU_COMMON_ETC_DIRECTORY
+#define ETCDIR				HAIKU_COMMON_SETTINGS_DIRECTORY
 
 #ifndef SSHDIR
 #define SSHDIR				ETCDIR "/ssh"
diff --git a/net-misc/openssh/sshd_keymaker.sh b/net-misc/openssh/sshd_keymaker.sh
index 2667bbad3..409b845ae 100755
--- a/net-misc/openssh/sshd_keymaker.sh
+++ b/net-misc/openssh/sshd_keymaker.sh
@@ -2,10 +2,10 @@
 
 # generate SSH host keys
 
-ETCSSHDIR=`finddir B_COMMON_ETC_DIRECTORY`/ssh
-mkdir -p ${ETCSSHDIR}
+SETTINGSSSHDIR=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh
+mkdir -p ${SETTINGSSSHDIR}
 
-hostKeyDir=${ETCSSHDIR}
+hostKeyDir=${SETTINGSSSHDIR}
 
 if [ ! -f "$hostKeyDir/ssh_host_key" ] ; then
 	ssh-keygen -t rsa1 -f "$hostKeyDir/ssh_host_key" -N ""