diff --git a/net/flvstreamer/Makefile b/net/flvstreamer/Makefile
new file mode 100644
index 00000000000..be0f0830605
--- /dev/null
+++ b/net/flvstreamer/Makefile
@@ -0,0 +1,28 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2009/05/24 23:57:01 sthen Exp $
+
+COMMENT =		dump RTMP media streams
+
+DISTNAME =		flvstreamer-1.7
+
+CATEGORIES =		net
+
+# GPLv2+
+PERMIT_PACKAGE_CDROM =	No
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =No
+PERMIT_DISTFILES_FTP =	Yes
+
+WANTLIB =		c m stdc++ crypto ssl
+
+MASTER_SITES =		http://spacehopper.org/mirrors/
+WRKDIST =		${WRKDIR}/flvstreamer
+
+USE_GMAKE =		Yes
+MAKE_FLAGS +=		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
+
+NO_REGRESS =		Yes
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKBUILD}/flvstreamer ${PREFIX}/bin
+
+.include <bsd.port.mk>
diff --git a/net/flvstreamer/distinfo b/net/flvstreamer/distinfo
new file mode 100644
index 00000000000..6f7ff1292f9
--- /dev/null
+++ b/net/flvstreamer/distinfo
@@ -0,0 +1,5 @@
+MD5 (flvstreamer-1.7.tar.gz) = FDZkpY3V3Z6al2VNidJ4KA==
+RMD160 (flvstreamer-1.7.tar.gz) = 0jWMob4ex4keLBTJkXTO1ETpL4A=
+SHA1 (flvstreamer-1.7.tar.gz) = fhau5FqoNZQjoYpkzL7RT1N9iZc=
+SHA256 (flvstreamer-1.7.tar.gz) = oKo7kzv01Ou2QXmFKvyfeaMnFdOl8iq2L0e7Plq3Pbk=
+SIZE (flvstreamer-1.7.tar.gz) = 48619
diff --git a/net/flvstreamer/patches/patch-Makefile b/net/flvstreamer/patches/patch-Makefile
new file mode 100644
index 00000000000..ea864763620
--- /dev/null
+++ b/net/flvstreamer/patches/patch-Makefile
@@ -0,0 +1,16 @@
+$OpenBSD: patch-Makefile,v 1.1.1.1 2009/05/24 23:57:01 sthen Exp $
+--- Makefile.orig	Mon May 25 00:41:57 2009
++++ Makefile	Mon May 25 00:42:03 2009
+@@ -12,10 +12,10 @@ clean:
+ 	rm -f *.o
+ 
+ streams: bytes.o log.o rtmp.o AMFObject.o rtmppacket.o streams.o parseurl.o handshake.o
+-	$(CXX) $(LDFLAGS) $^ -o $@_x86 -lpthread
++	$(CXX) $(LDFLAGS) $^ -o $@ -lpthread
+ 
+ flvstreamer: bytes.o log.o rtmp.o AMFObject.o rtmppacket.o flvstreamer.o parseurl.o handshake.o
+-	$(CXX) $(LDFLAGS) $^ -o $@_x86
++	$(CXX) $(LDFLAGS) $^ -o $@
+ 
+ bytes.o: bytes.cpp bytes.h Makefile
+ log.o: log.cpp log.h Makefile
diff --git a/net/flvstreamer/patches/patch-bytes_h b/net/flvstreamer/patches/patch-bytes_h
new file mode 100644
index 00000000000..89b69314347
--- /dev/null
+++ b/net/flvstreamer/patches/patch-bytes_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-bytes_h,v 1.1.1.1 2009/05/24 23:57:01 sthen Exp $
+--- bytes.h.orig	Tue Apr 28 19:07:58 2009
++++ bytes.h	Tue Apr 28 19:08:01 2009
+@@ -76,7 +76,7 @@ typedef unsigned long long int uint64_t;
+ 
+ // ok, we assume to have the same float word order and byte order if float word order is not defined
+ #ifndef __FLOAT_WORD_ORDER
+-#warning "Float word order not defined, assuming the same as byte order!"
++/* #warning "Float word order not defined, assuming the same as byte order!" */
+ #define __FLOAT_WORD_ORDER	__BYTE_ORDER
+ #endif
+ 
diff --git a/net/flvstreamer/pkg/DESCR b/net/flvstreamer/pkg/DESCR
new file mode 100644
index 00000000000..553e5732747
--- /dev/null
+++ b/net/flvstreamer/pkg/DESCR
@@ -0,0 +1,3 @@
+A small dumper for media content streamed over the RTMP protocol.
+Supplying an rtmp url will result in a dumped flv file, which can be
+played/transcoded using ffmpeg/mplayer, etc.
diff --git a/net/flvstreamer/pkg/PLIST b/net/flvstreamer/pkg/PLIST
new file mode 100644
index 00000000000..966539a9275
--- /dev/null
+++ b/net/flvstreamer/pkg/PLIST
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2009/05/24 23:57:01 sthen Exp $
+@bin bin/flvstreamer