diff --git a/Misc/ACKS b/Misc/ACKS
index 987e13fd387..410d5cd6da5 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -153,6 +153,7 @@ Jun Hamano
 Mark Hammond
 Manus Hand
 Milton L. Hankins
+Stephen Hansen
 Barry Hantman
 Lynda Hardman
 Jason Harper
diff --git a/PC/config.h b/PC/config.h
index a69c73bbff9..f6ad9c13d13 100644
--- a/PC/config.h
+++ b/PC/config.h
@@ -176,6 +176,8 @@ typedef int pid_t;
 #define HAVE_LONG_LONG 1
 #define LONG_LONG __int64
 
+#undef HAVE_HYPOT
+
 #else /* !_WIN32 */
 #error "Only Win32 and later are supported"
 #endif /* !_WIN32 */