diff --git a/ChangeLog b/ChangeLog
index 250599b57..3f9fc6afe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,7 @@
      set k->cert = NULL after freeing it
  - [blocks.c ed25519.c fe25519.c fe25519.h ge25519.c ge25519.h]
    [ge25519_base.data hash.c sc25519.c sc25519.h verify.c] Fix RCS idents
+ - [Makefile.in] Add ed25519 sources
 
 20131205
  - (djm) OpenBSD CVS Sync
diff --git a/Makefile.in b/Makefile.in
index 91f39d4f3..2c263af7e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.345 2013/11/21 03:12:23 djm Exp $
+# $Id: Makefile.in,v 1.346 2013/12/07 00:35:37 djm Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -74,7 +74,9 @@ LIBSSH_OBJS=authfd.o authfile.o bufaux.o bufbn.o buffer.o \
 	kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \
 	msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \
 	jpake.o schnorr.o ssh-pkcs11.o krl.o smult_curve25519_ref.o \
-	kexc25519.o kexc25519c.o poly1305.o chacha.o cipher-chachapoly.o
+	kexc25519.o kexc25519c.o poly1305.o chacha.o cipher-chachapoly.o \
+	ssh-ed25519.o \
+	sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o \
 
 SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
 	sshconnect.o sshconnect1.o sshconnect2.o mux.o \
diff --git a/configure.ac b/configure.ac
index c691200bc..95240f51c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.544 2013/12/05 00:00:16 dtucker Exp $
+# $Id: configure.ac,v 1.545 2013/12/07 00:35:37 djm Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
-AC_REVISION($Revision: 1.544 $)
+AC_REVISION($Revision: 1.545 $)
 AC_CONFIG_SRCDIR([ssh.c])
 AC_LANG([C])
 
@@ -1540,6 +1540,7 @@ AC_CHECK_FUNCS([ \
 	b64_pton \
 	__b64_pton \
 	bcopy \
+	bcrypt_pbkdf \
 	bindresvport_sa \
 	clock \
 	closefrom \