diff --git a/gitso/trunk/arch/linux/build_rpm.sh b/gitso/trunk/arch/linux/build_rpm.sh
index 6a74193..56ffc5e 100755
--- a/gitso/trunk/arch/linux/build_rpm.sh
+++ b/gitso/trunk/arch/linux/build_rpm.sh
@@ -33,6 +33,7 @@ cp GitsoThread.py $BUILD_ROOT/usr/share/gitso/
 cp Processes.py $BUILD_ROOT/usr/share/gitso/
 cp ArgsParser.py $BUILD_ROOT/usr/share/gitso/
 cp __init__.py $BUILD_ROOT/usr/share/gitso/
+cp NATPMP.py $BUILD_ROOT/usr/share/gitso/
 cp hosts.txt $BUILD_ROOT/usr/share/gitso/
 cp icon.ico $BUILD_ROOT/usr/share/gitso/
 cp icon.png $BUILD_ROOT/usr/share/gitso/
diff --git a/gitso/trunk/arch/linux/gitso_rpm.spec b/gitso/trunk/arch/linux/gitso_rpm.spec
index 33a7a53..5958771 100644
--- a/gitso/trunk/arch/linux/gitso_rpm.spec
+++ b/gitso/trunk/arch/linux/gitso_rpm.spec
@@ -54,6 +54,7 @@ simple two-step process that connects one person to another's screen.
 %{_prefix}/gitso/GitsoThread.py
 %{_prefix}/gitso/Gitso.py
 %{_prefix}/gitso/Processes.py
+%{_prefix}/gitso/NATPMP.py
 %{_prefix}/gitso/icon.ico
 
 %{_mandir}/man1/gitso.1.gz
diff --git a/gitso/trunk/arch/linux/gitso_rpm_fedora.spec b/gitso/trunk/arch/linux/gitso_rpm_fedora.spec
index 0439175..cfc936c 100644
--- a/gitso/trunk/arch/linux/gitso_rpm_fedora.spec
+++ b/gitso/trunk/arch/linux/gitso_rpm_fedora.spec
@@ -51,6 +51,7 @@ simple two-step process that connects one person to another's screen.
 %{_prefix}/gitso/Processes.py
 %{_prefix}/gitso/ArgsParser.py
 %{_prefix}/gitso/__init__.py
+%{_prefix}/gitso/NATPMP.py
 %{_prefix}/gitso/hosts.txt
 %{_prefix}/gitso/icon.ico
 %{_prefix}/gitso/icon.png
diff --git a/gitso/trunk/makegitso.sh b/gitso/trunk/makegitso.sh
index 7529bd0..38d090f 100755
--- a/gitso/trunk/makegitso.sh
+++ b/gitso/trunk/makegitso.sh
@@ -65,16 +65,9 @@ function snowLeopardDMG {
 	rm -f setup.py
 	rm -rf $OSX_BUILD_DIR
 	
-	#echo -e ".."
-	#py2applet --make-setup Gitso.py
-	
 	echo -e ".."
 	
-	# To manually include the wx libraries, I'm not sure we need them...
-	# python setup.py py2app --includes=wx --packages=wx
-	
 	python arch/osx/setup.py py2app
-	#rm setup.py
 	
 	echo -e ".."
 	cp arch/osx/Info_OSX-10.6.plist $OSX_BUILD_DIR/Gitso.app/Contents/
@@ -96,6 +89,7 @@ function snowLeopardDMG {
 	cp ConnectionWindow.py $OSX_BUILD_DIR/Gitso.app/Contents/Resources/
 	cp AboutWindow.py $OSX_BUILD_DIR/Gitso.app/Contents/Resources/
 	cp GitsoThread.py $OSX_BUILD_DIR/Gitso.app/Contents/Resources/
+	cp NATPMP.py $OSX_BUILD_DIR/Gitso.app/Contents/Resources/
 	
 	cp arch/osx/libjpeg-copyright.txt $OSX_BUILD_DIR/Gitso.app/Contents/Frameworks/
 	cp arch/osx/osxnvc_echoware-copyright.txt $OSX_BUILD_DIR/Gitso.app/Contents/Resources/OSXvnc/
@@ -153,6 +147,7 @@ function LeopardDMG {
 	cp ConnectionWindow.py $OSX_BUILD_DIR/Gitso.app/Contents/Resources/
 	cp AboutWindow.py $OSX_BUILD_DIR/Gitso.app/Contents/Resources/
 	cp GitsoThread.py $OSX_BUILD_DIR/Gitso.app/Contents/Resources/
+	cp NATPMP.py $OSX_BUILD_DIR/Gitso.app/Contents/Resources/
 	
 	cp arch/osx/libjpeg-copyright.txt $OSX_BUILD_DIR/Gitso.app/Contents/Frameworks/
 	cp arch/osx/osxnvc_echoware-copyright.txt $OSX_BUILD_DIR/Gitso.app/Contents/Resources/OSXvnc/
@@ -296,6 +291,7 @@ elif test "`uname -a 2>&1 | grep Linux | grep -v which`"; then
 		cp Processes.py $DEB_BUILD_DIR/usr/share/$DEB_BUILD_DIR/
 		cp ArgsParser.py $DEB_BUILD_DIR/usr/share/$DEB_BUILD_DIR/
 		cp __init__.py $DEB_BUILD_DIR/usr/share/$DEB_BUILD_DIR/
+		cp NATPMP.py $DEB_BUILD_DIR/usr/share/$DEB_BUILD_DIR/
 		cp hosts.txt $DEB_BUILD_DIR/usr/share/$DEB_BUILD_DIR/
 		cp icon.ico $DEB_BUILD_DIR/usr/share/$DEB_BUILD_DIR/
 		cp icon.png $DEB_BUILD_DIR/usr/share/$DEB_BUILD_DIR/