diff --git a/Propellor/Property/Ssh.hs b/Propellor/Property/Ssh.hs
index b13a12b..a39792c 100644
--- a/Propellor/Property/Ssh.hs
+++ b/Propellor/Property/Ssh.hs
@@ -122,6 +122,7 @@ fromKeyType :: SshKeyType -> String
 fromKeyType SshRsa = "rsa"
 fromKeyType SshDsa = "dsa"
 fromKeyType SshEcdsa = "ecdsa"
+fromKeyType SshEd25519 = "ed25519"
 
 -- | Puts some host's ssh public key into the known_hosts file for a user.
 knownHost :: [Host] -> HostName -> UserName -> Property
diff --git a/Propellor/Types.hs b/Propellor/Types.hs
index 5f575da..fc767cd 100644
--- a/Propellor/Types.hs
+++ b/Propellor/Types.hs
@@ -150,5 +150,5 @@ data PrivDataField
 
 type GpgKeyId = String
 
-data SshKeyType = SshRsa | SshDsa | SshEcdsa
+data SshKeyType = SshRsa | SshDsa | SshEcdsa | SshEd25519
 	deriving (Read, Show, Ord, Eq)