diff --git a/compat/mingw.c b/compat/mingw.c
index 20eadd2334..166e2ad5f0 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -123,8 +123,14 @@ int git_fstat(int fd, struct stat *buf)
 {
 	HANDLE fh = (HANDLE)_get_osfhandle(fd);
 	BY_HANDLE_FILE_INFORMATION fdata;
+	char dummy[sizeof(void*)];
+	int s = sizeof(void*);
 
-	if (fh != INVALID_HANDLE_VALUE && GetFileInformationByHandle(fh, &fdata)) {
+	if (fh == INVALID_HANDLE_VALUE) {
+		errno = EBADF;
+		return -1;
+	}
+	if (GetFileInformationByHandle(fh, &fdata)) {
 		int fMode = S_IREAD;
 		if (fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
 			fMode |= S_IFDIR;
@@ -145,7 +151,22 @@ int git_fstat(int fd, struct stat *buf)
 		buf->st_ctime = filetime_to_time_t(&(fdata.ftCreationTime));
 		return 0;
 	}
-	errno = EBADF;
+	switch (GetLastError()) {
+	case ERROR_INVALID_FUNCTION:
+		/* check for socket */
+		if (getsockopt((int)fh, SOL_SOCKET, SO_KEEPALIVE, dummy, &s) &&
+		    WSAGetLastError() == WSAENOTSOCK)
+			goto badf;
+		memset(buf, sizeof(*buf), 0);
+		buf->st_mode = S_IREAD|S_IWRITE;
+		buf->st_mode |= 0x140000; /* S_IFSOCK */
+		return 0;
+	default:
+	case ERROR_INVALID_HANDLE:
+	badf:
+		errno = EBADF;
+		break;
+	}
 	return -1;
 }