diff --git a/net/Makefile b/net/Makefile
index f0c48492666c..a08c711da1f0 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -200,6 +200,7 @@
     SUBDIR += gsambad
     SUBDIR += gsk
     SUBDIR += gspoof
+    SUBDIR += gssdp
     SUBDIR += gstreamer-plugins-libmms
     SUBDIR += gtic
     SUBDIR += gtk-vnc
diff --git a/net/gssdp/Makefile b/net/gssdp/Makefile
new file mode 100644
index 000000000000..5e1d25c20b99
--- /dev/null
+++ b/net/gssdp/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for:	gssdp
+# Date created:		2009-12-26
+# Whom:			Martin Wilke <miwi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gssdp
+PORTVERSION=	0.7.1
+CATEGORIES=	net
+MASTER_SITES=	http://www.gupnp.org/sources/${PORTNAME}/
+
+MAINTAINER=	miwi@FreeBSD.org
+COMMENT=	Framework for UPnP devices
+
+LIB_DEPENDS+=	soup-2.4.1:${PORTSDIR}/devel/libsoup
+
+USE_PYTHON=	yes
+GNU_CONFIGURE=	yes
+USE_GNOME=	gnomehack intlhack libglade2 glib20
+USE_LDCONFIG=	yes
+
+.include <bsd.port.mk>
diff --git a/net/gssdp/distinfo b/net/gssdp/distinfo
new file mode 100644
index 000000000000..7cc0510d1886
--- /dev/null
+++ b/net/gssdp/distinfo
@@ -0,0 +1,3 @@
+MD5 (gssdp-0.7.1.tar.gz) = 725c32e8f92a072cc34f0e091937df2a
+SHA256 (gssdp-0.7.1.tar.gz) = 8eaab799f699836770ec2fcc08abfef2f824a82ae959c6af7b39ffb6968b9fd7
+SIZE (gssdp-0.7.1.tar.gz) = 367681
diff --git a/net/gssdp/files/patch-libgssdp-gssdp-socket-source.c b/net/gssdp/files/patch-libgssdp-gssdp-socket-source.c
new file mode 100644
index 000000000000..24b8d9018503
--- /dev/null
+++ b/net/gssdp/files/patch-libgssdp-gssdp-socket-source.c
@@ -0,0 +1,19 @@
+--- libgssdp/gssdp-socket-source.c.orig	2009-12-02 12:06:02.000000000 +0100
++++ libgssdp/gssdp-socket-source.c	2009-12-26 13:55:10.000000000 +0100
+@@ -154,6 +154,16 @@
+                 if (res == -1)
+                         goto error;
+ 
++#ifdef __FreeBSD__
++                res = setsockopt (socket_source->poll_fd.fd,
++                                  SOL_SOCKET,
++                                  SO_REUSEPORT,
++                                  &boolean,
++                                  sizeof (boolean));
++                if (res == -1)
++                        goto error;
++#endif
++
+                 /* Subscribe to multicast channel */
+                 res = inet_aton (SSDP_ADDR, &(mreq.imr_multiaddr));
+                 if (res == 0)
diff --git a/net/gssdp/files/patch-tools-gssdp-devices-sniffer.c b/net/gssdp/files/patch-tools-gssdp-devices-sniffer.c
new file mode 100644
index 000000000000..a4c5da117b12
--- /dev/null
+++ b/net/gssdp/files/patch-tools-gssdp-devices-sniffer.c
@@ -0,0 +1,11 @@
+--- tools/gssdp-device-sniffer.c.orig	2009-07-29 15:53:32.000000000 +0200
++++ tools/gssdp-device-sniffer.c	2009-12-26 13:56:48.000000000 +0100
+@@ -319,7 +319,7 @@
+ 
+         uuid = usn_tokens[0] + 5; /* skip the prefix 'uuid:' */
+ 
+-        if (usn_tokens[1]) {
++        if (usn_tokens[1] && strlen(usn_tokens[1]) != 0) {
+                 char **urn_tokens;
+ 
+                 urn_tokens = g_strsplit (usn_tokens[1], ":device:", -1);
diff --git a/net/gssdp/pkg-descr b/net/gssdp/pkg-descr
new file mode 100644
index 000000000000..9ea17544a312
--- /dev/null
+++ b/net/gssdp/pkg-descr
@@ -0,0 +1,4 @@
+A GObject-based API for handling resource discovery and announcement
+over SSDP.
+
+WWW:	http://www.gupnp.org/
diff --git a/net/gssdp/pkg-plist b/net/gssdp/pkg-plist
new file mode 100644
index 000000000000..f1664b7528ce
--- /dev/null
+++ b/net/gssdp/pkg-plist
@@ -0,0 +1,32 @@
+bin/gssdp-device-sniffer
+include/gssdp-1.0/libgssdp/gssdp-client.h
+include/gssdp-1.0/libgssdp/gssdp-error.h
+include/gssdp-1.0/libgssdp/gssdp-resource-browser.h
+include/gssdp-1.0/libgssdp/gssdp-resource-group.h
+include/gssdp-1.0/libgssdp/gssdp.h
+lib/libgssdp-1.0.a
+lib/libgssdp-1.0.la
+lib/libgssdp-1.0.so
+lib/libgssdp-1.0.so.2
+libdata/pkgconfig/gssdp-1.0.pc
+%%DATADIR%%/gssdp-device-sniffer.ui
+share/gtk-doc/html/gssdp/GSSDPClient.html
+share/gtk-doc/html/gssdp/GSSDPResourceBrowser.html
+share/gtk-doc/html/gssdp/GSSDPResourceGroup.html
+share/gtk-doc/html/gssdp/ch01.html
+share/gtk-doc/html/gssdp/gssdp-Error-codes.html
+share/gtk-doc/html/gssdp/gssdp.devhelp
+share/gtk-doc/html/gssdp/gssdp.devhelp2
+share/gtk-doc/html/gssdp/home.png
+share/gtk-doc/html/gssdp/index.html
+share/gtk-doc/html/gssdp/index.sgml
+share/gtk-doc/html/gssdp/left.png
+share/gtk-doc/html/gssdp/right.png
+share/gtk-doc/html/gssdp/style.css
+share/gtk-doc/html/gssdp/up.png
+@dirrmtry share/gtk-doc/html/gssdp
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
+@dirrm %%DATADIR%%
+@dirrmtry include/gssdp-1.0/libgssdp
+@dirrmtry include/gssdp-1.0