diff --git a/examples/Jamfile b/examples/Jamfile
index baf36e6ea..2a0ea3b4f 100644
--- a/examples/Jamfile
+++ b/examples/Jamfile
@@ -24,4 +24,5 @@ exe make_torrent : make_torrent.cpp ;
 exe enum_if : enum_if.cpp ;
 exe connection_tester : connection_tester.cpp ;
 exe fragmentation_test : fragmentation_test.cpp ;
+exe upnp_test : upnp_test.cpp ;
 
diff --git a/examples/upnp_test.cpp b/examples/upnp_test.cpp
new file mode 100644
index 000000000..8401b2d12
--- /dev/null
+++ b/examples/upnp_test.cpp
@@ -0,0 +1,94 @@
+/*
+
+Copyright (c) 2003, Arvid Norberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the distribution.
+    * Neither the name of the author nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include <stdlib.h>
+#include "libtorrent/session.hpp"
+#include "libtorrent/alert_types.hpp"
+
+void print_alert(libtorrent::alert const* a)
+{
+	using namespace libtorrent;
+
+	if (alert_cast<portmap_error_alert>(a))
+	{
+		printf("%s","\x1b[32m");
+	}
+	else if (alert_cast<portmap_alert>(a))
+	{
+		printf("%s","\x1b[33m");
+	}
+
+	printf("[%s] %s\n", time_now_string(), a->message().c_str());
+	printf("%s", "\x1b[0m");
+}
+
+int main(int argc, char* argv[])
+{
+	using namespace libtorrent;
+
+	if (argc != 1)
+	{
+		fputs("usage: ./upnp_test\n", stderr);
+		return 1;
+	}
+
+	session* s = new session;
+	s->set_alert_mask(alert::port_mapping_notification);
+
+	for (;;)
+	{
+		alert const* a = s->wait_for_alert(seconds(5));
+		if (a == 0)
+		{
+			s->stop_upnp();
+			break;
+		}
+		std::auto_ptr<alert> holder = s->pop_alert();
+		print_alert(holder.get());
+	}
+
+	printf("\x1b[1m\n\n===================== done mapping. Now deleting mappings ========================\n\n\n\x1b[0m");
+
+	for (;;)
+	{
+		alert const* a = s->wait_for_alert(seconds(5));
+		if (a == 0) break;
+		std::auto_ptr<alert> holder = s->pop_alert();
+		print_alert(holder.get());
+	}
+
+	delete s;
+	s = 0;
+
+	return 0;
+}
+