diff --git a/src/version.c b/src/version.c
index 0431474000..80f5048359 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3958,
 /**/
     3957,
 /**/
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index cf2a3569f5..c32b9b8fbe 100644
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -72,6 +72,10 @@
 # define CYGWIN
 #endif
 
+#if (defined(__linux__) && !defined(__ANDROID__)) || defined(__CYGWIN__)
+# define _XOPEN_SOURCE 700   /* for fdopen() */
+#endif
+
 #include <stdio.h>
 #ifdef VAXC
 # include <file.h>