diff --git a/net-misc/openssh/sshd_keymaker.sh b/net-misc/openssh/additional-files/sshd_keymaker.sh
similarity index 100%
rename from net-misc/openssh/sshd_keymaker.sh
rename to net-misc/openssh/additional-files/sshd_keymaker.sh
diff --git a/net-misc/openssh/openssh-5.8p2.recipe b/net-misc/openssh/openssh-5.8p2.recipe
index c7c14d203..8b0c28a9f 100644
--- a/net-misc/openssh/openssh-5.8p2.recipe
+++ b/net-misc/openssh/openssh-5.8p2.recipe
@@ -12,6 +12,8 @@ ARCHITECTURES="x86_gcc2 ?x86"
 
 PATCHES="openssh-5.8p2.patch"
 
+ADDITIONAL_FILES="sshd_keymaker.sh"
+
 PROVIDES="
 	openssh = $portVersion compat >= 5
 	cmd:scp = $portVersion compat >= 5
@@ -80,7 +82,7 @@ INSTALL()
 	make install-nokeys
 	postInstallDir=$prefix/boot/post_install
 	mkdir -p $postInstallDir
-	cp -f $portDir/sshd_keymaker.sh $postInstallDir
+	cp -f $portDir/additional-files/sshd_keymaker.sh $postInstallDir
 }
 
 TEST()
diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe
index b128a0192..295d66ed5 100644
--- a/net-misc/openssh/openssh-6.0p1.recipe
+++ b/net-misc/openssh/openssh-6.0p1.recipe
@@ -9,6 +9,8 @@ ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="openssh-6.0p1.patch"
 
+ADDITIONAL_FILES="sshd_keymaker.sh"
+
 PROVIDES="
 	openssh = $portVersion compat >= 5
 	cmd:scp = $portVersion compat >= 5
@@ -106,7 +108,7 @@ INSTALL()
 {
 	make install-nokeys
 	mkdir -p $postInstallDir
-	cp -f $portDir/sshd_keymaker.sh $postInstallDir
+	cp -f $portDir/additional-files/sshd_keymaker.sh $postInstallDir
 }
 
 TEST()