diff --git a/ChangeLog b/ChangeLog
index fbdf12179..be1030f6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -249,6 +249,7 @@
    EVP_sha256 if present
  - (djm) [includes.h] Restore accidentally dropped netinet/in.h
  - (djm) [Makefile.in openbsd-compat/Makefile.in] Add added files
+ - (djm) [md-sha256.c configure.ac] md-sha256.c needs sha2.h if present
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4150,4 +4151,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4210 2006/03/15 02:09:18 djm Exp $
+$Id: ChangeLog,v 1.4211 2006/03/15 02:12:41 djm Exp $
diff --git a/configure.ac b/configure.ac
index 160493f06..fc54f3b54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.334 2006/03/15 02:02:28 djm Exp $
+# $Id: configure.ac,v 1.335 2006/03/15 02:12:41 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.334 $)
+AC_REVISION($Revision: 1.335 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -690,6 +690,7 @@ AC_CHECK_HEADERS( \
 	readpassphrase.h \
 	rpc/types.h \
 	security/pam_appl.h \
+	sha2.h \
 	shadow.h \
 	stddef.h \
 	stdint.h \
diff --git a/md-sha256.c b/md-sha256.c
index 82c526d33..ff7f38157 100644
--- a/md-sha256.c
+++ b/md-sha256.c
@@ -20,7 +20,11 @@
 
 #ifndef HAVE_EVP_SHA256
 
+#include <string.h>
 #include <openssl/evp.h>
+#if defined(HAVE_SHA2_H) && defined(HAVE_SHA256_UPDATE)
+# include <sha2.h>
+#endif
 
 RCSID("$OpenBSD: md-sha256.c,v 1.1 2006/03/07 09:07:40 djm Exp $");