diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 407e5e854..d8f61d865 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-28  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* lib/test.c: Include wsnetbsd.h.
+
+2002-01-28  Kai Henningsen  <kai-henningsen@users.sourceforge.net>
+
+	* include/wsnetbs.h: New file.
+
 2002-01-25  Earnie Boyd  <earnie@users.sf.net>
 
 	* include/winnt.h: Remove merge conflict.
diff --git a/winsup/w32api/include/wsnetbs.h b/winsup/w32api/include/wsnetbs.h
new file mode 100644
index 000000000..84b28376b
--- /dev/null
+++ b/winsup/w32api/include/wsnetbs.h
@@ -0,0 +1,32 @@
+#ifndef _WSNETBS_H
+#define _WSNETBS_H
+
+#define NETBIOS_NAME_LENGTH	16
+#define NETBIOS_UNIQUE_NAME	0
+#define NETBIOS_GROUP_NAME	1
+#define NETBIOS_TYPE_QUICK_UNIQUE	2
+#define NETBIOS_TYPE_QUICK_GROUP	3
+
+#ifndef RC_INVOKED
+typedef struct sockaddr_nb {
+	short	snb_family;
+	u_short	snb_type;
+	char	snb_name[NETBIOS_NAME_LENGTH];
+} SOCKADDR_NB, *PSOCKADDR_NB, *LPSOCKADDR_NB;
+#define SET_NETBIOS_SOCKADDR(_snb,_type,_name,_port) \
+{ \
+	register int _i; \
+	register char *_n = (_name); \
+	register PSOCKADDR_NB _s = (_snb); \
+	_s->snb_family = AF_NETBIOS; \
+	_s->snb_type = (_type); \
+	for (_i=0; _n[_i] != '\0' && _i<NETBIOS_NAME_LENGTH-1; _i++) { \
+		_s->snb_name[_i] = _n[_i]; \
+	} \
+	for (; _i<NETBIOS_NAME_LENGTH-1; _i++) { \
+		_s->snb_name[_i] = ' '; \
+	} \
+	_s->snb_name[NETBIOS_NAME_LENGTH-1] = (_port); \
+}
+#endif   /* RC_INVOKED */
+#endif
diff --git a/winsup/w32api/lib/test.c b/winsup/w32api/lib/test.c
index 2d9284c08..1a30b8d53 100644
--- a/winsup/w32api/lib/test.c
+++ b/winsup/w32api/lib/test.c
@@ -55,6 +55,7 @@
 #include <winresrc.h>
 #include <winsock.h>
 #include <ws2tcpip.h>
+#include <wsnetbs.h>
 #include <setupapi.h>
 #include <aclapi.h>