diff --git a/package/base/openssh/postinstall.sh b/package/base/openssh/postinstall.sh
new file mode 100644
index 000000000..8d21658ba
--- /dev/null
+++ b/package/base/openssh/postinstall.sh
@@ -0,0 +1,21 @@
+if any_installed "usr/bin/ssh-keygen" ; then
+	if [ ! -f /etc/ssh/ssh_host_key ] ; then
+		echo "Creating /etc/ssh/ssh_host_key"
+		/usr/bin/ssh-keygen -t rsa1 -f /etc/ssh/ssh_host_key -N ''
+	fi
+	if [ ! -f /etc/ssh/ssh_host_dsa_key ] ; then
+		echo "Creating /etc/ssh/ssh_host_dsa_key"
+		/usr/bin/ssh-keygen -t dsa  -f /etc/ssh/ssh_host_dsa_key -N ''
+	fi
+	if [ ! -f /etc/ssh/ssh_host_rsa_key ] ; then
+		echo "Creating /etc/ssh/ssh_host_rsa_key"
+		/usr/bin/ssh-keygen -t rsa  -f /etc/ssh/ssh_host_rsa_key -N ''
+	fi
+fi
+
+exit 0
+
+if any_removed "usr/bin/ssh-keygen" ; then
+	echo "Removing ssh host keys"
+	rm -f /etc/ssh/ssh_host_key /etc/ssh/ssh_host_dsa_key /etc/ssh/ssh_host_rsa_key
+fi
diff --git a/package/base/openssh/stone_mod_sshd.sh b/package/base/openssh/stone_mod_sshd.sh
index 84e21e74c..3514a108e 100644
--- a/package/base/openssh/stone_mod_sshd.sh
+++ b/package/base/openssh/stone_mod_sshd.sh
@@ -22,18 +22,9 @@
 #
 # [MAIN] 50 sshd SSH Daemon configuration
 
-ssh_create_hostpair(){
-	gui_cmd "Creating ssh host keypair" \
-                "/usr/bin/ssh-keygen -t rsa1 -f /etc/ssh/ssh_host_key -N '' ; \
-		 /usr/bin/ssh-keygen -t dsa  -f /etc/ssh/ssh_host_dsa_key -N '' ; \
-		 /usr/bin/ssh-keygen -t rsa  -f /etc/ssh/ssh_host_rsa_key -N '' "
-}
-
 main() {
     while
 	gui_menu alsa 'SSH Daemon Configuration.' \
-		'Create a ssh host keypair' \
-			'ssh_create_hostpair' \
 		'Configure runlevels for sshd service' \
                         '$STONE runlevel edit_srv sshd' \
                 '(Re-)Start sshd init script' \