diff --git a/AUTHORS b/AUTHORS
index ff630b39f..8bce9600d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -66,6 +66,7 @@ Other Contributors
 Third-Party Resources
 Thanks to:
         Niels Provos for use of libevent <http://monkey.org/~provos/libevent/>
+	Thomas Bernard for use of MiniUPnP. <http://miniupnp.tuxfamily.org/>
         The Growl Development Team for use of Growl. <http://growl.info/>
         Andy Matuschak for use of Sparkle. <http://sparkle.andymatuschak.org/>
         M. Uli Kusterer for use of UKKQueue.
diff --git a/NEWS b/NEWS
index 3e42d304f..a6bcdbb56 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 NEWS file for Transmission <http://transmission.m0k.org/>
 
 1.00 (zzzz/xx/yy)
+- All Platforms:
+   + UPnP now performed with MiniUPnP
 - OS X:
    + Leopard: Time Machine will ignore incomplete downloads
    + Pieces Bar (return of Advanced Bar)
diff --git a/macosx/Credits.rtf b/macosx/Credits.rtf
index f9760fcb9..391d0073b 100644
--- a/macosx/Credits.rtf
+++ b/macosx/Credits.rtf
@@ -1,5 +1,5 @@
-{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf440
-{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;}
+{\rtf1\ansi\ansicpg1252\cocoartf949
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;\red127\green127\blue127;}
 \vieww9000\viewh8400\viewkind0
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\qc
@@ -8,12 +8,12 @@
 \fs24 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\qc
 
-\f1\b0 \cf0 http://transmission.m0k.org/
-\f0\b \
+\b0 \cf0 http://transmission.m0k.org/
+\b \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 \cf0 \
 Lead Developers
-\f1\b0  <transmission-dev@m0k.org>\
+\b0  <transmission-dev@m0k.org>\
 	Mitchell Livingston <livings124@gmail.com>
 \fs20 \cf2   (Mac OS X interface, Back-end)
 \fs24 \cf0 \
@@ -33,8 +33,8 @@ Lead Developers
 \cf0 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\f0\b \cf0 Project Contributors
-\f1\b0 \
+\b \cf0 Project Contributors
+\b0 \
 	Nick Pucius
 \fs20 \cf2   (Mac OS X Help documentation)\
 
@@ -48,8 +48,8 @@ Lead Developers
 \cf0 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\f0\b \cf0 Translators
-\f1\b0 \cf2 \
+\b \cf0 Translators
+\b0 \cf2 \
 \cf0 Mac OS X, current release:\
 	Jorge Carrasco \cf2  
 \fs20 (Spanish)\
@@ -79,20 +79,20 @@ Lead Developers
 \cf0 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\qc
 
-\f0\b\fs28 \cf0 Special Thanks\
+\b\fs28 \cf0 Special Thanks\
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
 \fs24 \cf0 \
 Image Contributors\
 
-\f1\b0 	FOOOD
-\f0\b \
+\b0 	FOOOD
+\b \
 
-\f1\b0 	Martin Stadtmueller 
+\b0 	Martin Stadtmueller 
 \fs20 \cf2  (Icon tweaking)
-\f0\b\fs24 \cf0 \
+\b\fs24 \cf0 \
 
-\f1\b0 	Mike Matas <http://www.mikematas.com/> 
+\b0 	Mike Matas <http://www.mikematas.com/> 
 \fs20 \cf2  (Previous toolbar icons)
 \fs24 \cf0 \
 	Jonas Rask 
@@ -104,8 +104,8 @@ Image Contributors\
 \fs24 \cf0 \
 \
 
-\f0\b Other Contributors
-\f1\b0 \
+\b Other Contributors
+\b0 \
 	Omar and Adrien 
 \fs20 \cf2  (Beta testing)
 \fs24 \cf0 \
@@ -125,7 +125,7 @@ Image Contributors\
 \fs24 \cf0 	Michael Demars <keul@m0k.org> 
 \fs20 \cf2  (Mac OS X patches)\
 
-\fs24 \cf0 	Fredrik Mod\'8een
+\fs24 \cf0 	Fredrik Mod\'e9en
 \fs20 \cf2  (BeOS patches)
 \fs24 \cf0 \
 	Deanna Phillips 
@@ -139,10 +139,11 @@ Image Contributors\
 \cf0 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\f0\b \cf0 Third-Party Resources\
+\b \cf0 Third-Party Resources\
 
-\f1\b0 Thanks to:\
+\b0 Thanks to:\
 	Niels Provos for use of libevent. <http://monkey.org/~provos/libevent/>\
+	Thomas Bernard for use of MiniUPnP. <http://miniupnp.tuxfamily.org/>\
 	The Growl Development Team for use of Growl. <http://growl.info/>\
 	Andy Matuschak for use of Sparkle. <http://sparkle.andymatuschak.org/>\
 	M. Uli Kusterer for use of UKKQueue.}
\ No newline at end of file