diff --git a/gitso/trunk/CHANGELOG.txt b/gitso/trunk/CHANGELOG.txt
index f646992..9e56e58 100644
--- a/gitso/trunk/CHANGELOG.txt
+++ b/gitso/trunk/CHANGELOG.txt
@@ -1,7 +1,23 @@
 0.6
 ----------------------------
-*added --dev option while testing
+# Complete rewrite of process management.
+# Actually stop VNC Processes (Windows)
+# Support loading remote hosts file.
+# Command line switches
 
+    * --dev (Done)
+    * --listen (Done)
+    * --connect IP (Done)
+    * --list list_file (Done)
+    * --version (Done)
+    * --help (Done) 
+
+# manpage for (Linux)
+# Support for .rpms (Fedora, OpenSUSE, CentOS)
+# Implement Native VNC listener (OS X)
+# Better process management, user gets notified if connection is broken.
+# Licensing Updates (across the board).
+# Improved documentation. 
 
 0.5 - "Kill the undead"
 -----------------------------------------
diff --git a/gitso/trunk/ConnectionWindow.py b/gitso/trunk/ConnectionWindow.py
index 3a9594f..7d16af8 100644
--- a/gitso/trunk/ConnectionWindow.py
+++ b/gitso/trunk/ConnectionWindow.py
@@ -46,6 +46,9 @@ class ConnectionWindow(wx.Frame):
 		self.thread = None
 		self.threadLock = thread.allocate_lock()
 		
+		# Disable until 0.7 release
+		self.enablePMP = False
+		
 		if sys.platform.find('linux') != -1:
 			width = 165
 			height = 350
@@ -85,8 +88,9 @@ class ConnectionWindow(wx.Frame):
 		
 		# checkbox for natpmp
 		if sys.platform == 'darwin' or sys.platform.find('linux') != -1:
-			self.cb1 = wx.CheckBox(self, -1, 'Use NAT-PMP', (130, 48))
-			self.cb1.Enable(False)
+			if self.enablePMP:
+				self.cb1 = wx.CheckBox(self, -1, 'Use NAT-PMP', (130, 48))
+				self.cb1.Enable(False)
 
 
 		# the combobox Control
@@ -163,12 +167,14 @@ class ConnectionWindow(wx.Frame):
 			self.ToggleValue = 0
 			self.hostField.Enable(True)
 			if sys.platform == 'darwin' or sys.platform.find('linux') != -1:
-				self.cb1.Enable(False)
+				if self.enablePMP:
+					self.cb1.Enable(False)
 		else:
 			self.ToggleValue = 1
 			self.hostField.Enable(False)
 			if sys.platform == 'darwin' or sys.platform.find('linux') != -1:
-				self.cb1.Enable(True)
+				if self.enablePMP:
+					self.cb1.Enable(True)
 	
 	
 	def ConnectSupport(self, event):
diff --git a/gitso/trunk/GitsoThread.py b/gitso/trunk/GitsoThread.py
index a1c9b75..5a3986a 100755
--- a/gitso/trunk/GitsoThread.py
+++ b/gitso/trunk/GitsoThread.py
@@ -60,9 +60,10 @@ class GitsoThread(threading.Thread):
 		else:
 			# Give Support
 			if sys.platform == 'darwin' or sys.platform.find('linux') != -1:
-				self.window.cb1.Enable(False)
-				if self.window.cb1.GetValue() == True:
-					self.NATPMP('request')
+				if self.window.enablePMP:
+					self.window.cb1.Enable(False)
+					if self.window.cb1.GetValue() == True:
+						self.NATPMP('request')
 			
 			self.pid = self.process.giveSupport()
 			time.sleep(.5)
@@ -99,10 +100,11 @@ class GitsoThread(threading.Thread):
 		@author: Aaron Gerber
 		"""
 		if sys.platform == 'darwin' or sys.platform.find('linux') != -1:
-			if self.window.rb1.GetValue() == False: #give support
-				if self.window.cb1.GetValue() == True:
-					self.NATPMP('giveup')
-				self.window.cb1.Enable(True)
+			if self.window.enablePMP:
+				if self.window.rb1.GetValue() == False: #give support
+					if self.window.cb1.GetValue() == True:
+						self.NATPMP('giveup')
+					self.window.cb1.Enable(True)
 	
 		self.process.KillPID()
 		self.pid = 0
@@ -148,19 +150,20 @@ class GitsoThread(threading.Thread):
 		@author: Dennis Koot
 		"""
 		if sys.platform == 'darwin' or sys.platform.find('linux') != -1:
-			if action == 'request':
-				lifetime = 3600
-				print "Request port 5500 (NAT-PMP)."
-			else:
-				lifetime = 0
-				print "Give up port 5500 (NAT-PMP)."
-	
-			pubpriv_port = int(5500)
-			protocol = NATPMP.NATPMP_PROTOCOL_TCP
-			
-			try:
-				gateway = NATPMP.get_gateway_addr()
-				print NATPMP.map_port(protocol, pubpriv_port, pubpriv_port, lifetime, gateway_ip=gateway)
-			except:
-				print "Warning: Unable to automap port."
+			if self.window.enablePMP:
+				if action == 'request':
+					lifetime = 3600
+					print "Request port 5500 (NAT-PMP)."
+				else:
+					lifetime = 0
+					print "Give up port 5500 (NAT-PMP)."
+		
+				pubpriv_port = int(5500)
+				protocol = NATPMP.NATPMP_PROTOCOL_TCP
+				
+				try:
+					gateway = NATPMP.get_gateway_addr()
+					print NATPMP.map_port(protocol, pubpriv_port, pubpriv_port, lifetime, gateway_ip=gateway)
+				except:
+					print "Warning: Unable to automap port."
 
diff --git a/gitso/trunk/arch/linux/build_rpm.sh b/gitso/trunk/arch/linux/build_rpm.sh
index 56ffc5e..8fc7639 100755
--- a/gitso/trunk/arch/linux/build_rpm.sh
+++ b/gitso/trunk/arch/linux/build_rpm.sh
@@ -7,7 +7,6 @@ if test "$1" = ""; then
 fi
 
 echo -e "Setting up RPM build-root!\n\t"
-echo -e "'$1'\n"
 
 BUILD_ROOT="$HOME/rpmbuild/BUILDROOT/gitso-0.6-1.i386"
 
@@ -40,3 +39,5 @@ cp icon.png $BUILD_ROOT/usr/share/gitso/
 
 gzip -cf arch/linux/gitso.1 > $BUILD_ROOT/usr/share/man/man1/gitso.1.gz
 
+echo 'Done';
+
diff --git a/gitso/trunk/arch/linux/changelog b/gitso/trunk/arch/linux/changelog
index 1803d00..ddf23a8 100644
--- a/gitso/trunk/arch/linux/changelog
+++ b/gitso/trunk/arch/linux/changelog
@@ -1,3 +1,24 @@
+PACKAGE (0.6) karmic; urgency=low
+
+  * Complete rewrite of process management.
+  * Actually stop VNC Processes (Windows)
+  * Support loading remote hosts file.
+  * Command line switches
+  *     --dev (Done)
+  *     --listen (Done)
+  *     --connect IP (Done)
+  *     --list list_file (Done)
+  *     --version (Done)
+  *     --help (Done) 
+  * manpage for (Linux)
+  * Support for .rpms (Fedora, OpenSUSE, CentOS)
+  * Implement Native VNC listener (OS X)
+  * Better process management, user gets notified if connection is broken.
+  * Licensing Updates (across the board).
+  * Improved documentation. 
+
+ -- Aaron D. Gerber <gerberad@gmail.com>  Sun, 21 Feb 2010 17:32:40 -0600
+
 PACKAGE (0.5) hardy; urgency=low
 
   * Complete rewrite of the interface
diff --git a/gitso/trunk/arch/linux/gitso_rpm.spec b/gitso/trunk/arch/linux/gitso_rpm.spec
index 5958771..9dec948 100644
--- a/gitso/trunk/arch/linux/gitso_rpm.spec
+++ b/gitso/trunk/arch/linux/gitso_rpm.spec
@@ -41,21 +41,21 @@ simple two-step process that connects one person to another's screen.
 
 %{_prefix}/applications/gitso.desktop
 
-%{_prefix}/doc/gitso/copyright
+%{_prefix}/doc/gitso/COPYING
 %{_prefix}/doc/gitso/README
 %{_prefix}/doc/gitso/changelog.gz
 
-%{_prefix}/gitso/icon.png
-%{_prefix}/gitso/ArgsParser.py
-%{_prefix}/gitso/__init__.py
-%{_prefix}/gitso/hosts.txt
-%{_prefix}/gitso/AboutWindow.py
+%{_prefix}/gitso/Gitso.py
 %{_prefix}/gitso/ConnectionWindow.py
+%{_prefix}/gitso/AboutWindow.py
 %{_prefix}/gitso/GitsoThread.py
-%{_prefix}/gitso/Gitso.py
 %{_prefix}/gitso/Processes.py
+%{_prefix}/gitso/ArgsParser.py
+%{_prefix}/gitso/__init__.py
+%{_prefix}/gitso/hosts.txt
 %{_prefix}/gitso/NATPMP.py
 %{_prefix}/gitso/icon.ico
+%{_prefix}/gitso/icon.png
 
 %{_mandir}/man1/gitso.1.gz
 
diff --git a/gitso/trunk/makegitso.sh b/gitso/trunk/makegitso.sh
index 0a18f1f..2cb7363 100755
--- a/gitso/trunk/makegitso.sh
+++ b/gitso/trunk/makegitso.sh
@@ -34,6 +34,7 @@ function mksrc {
 
 		# Clean up first.
 		find . -name "*~" -exec rm {} ';'
+
 		rm -rf $OSX_BUILD_DIR
 		rm -rf $RPM_BUILD_DIR
 		rm -rf $DEB_BUILD_DIR
@@ -332,11 +333,12 @@ elif test "`uname -a 2>&1 | grep Linux | grep -v which`"; then
 		# RPM version of Gitso
 		if [ "$RPMNAME" = "fedora" ]; then
 			SPEC="gitso_rpm_fedora.spec"
-			# Before installing the .rpm
-			# You need to install http://dl.atrpms.net/all/x11vnc-0.9.3-3.fc9.i386.rpm
 			# yum --nogpgcheck install gitso_0.6-1_fedora.i386.rpm 
-		else
+		elif [ "$RPMNAME" = "opensuse" ]; then
 			SPEC="gitso_rpm.spec"
+		else
+		    echo -e "Error: Please '$RPMNAME' specify --opensuse or --fedora\n"
+		    exit 1
 		fi
 
 		echo "Creating $RPM"
@@ -345,7 +347,7 @@ elif test "`uname -a 2>&1 | grep Linux | grep -v which`"; then
 		BUILD_ROOT="$RPM_BUILD_DIR/rpm/tmp/gitso-root"
 
 		# We need this because the rpmbuild below needs to the source ball.
-		# Also realize that mksrc is going to clean-up, so if you creat dist files before this line
+		# Also realize that mksrc is going to clean-up, so if you creat diste files before this line
 		# They will be deleted.
 		mksrc
 		
@@ -356,8 +358,14 @@ elif test "`uname -a 2>&1 | grep Linux | grep -v which`"; then
 
 		cp arch/linux/$SPEC $TMP
 		perl -e 's/%\(echo \$HOME\)/$ENV{'RPM_BUILD_DIR'}/g;' -pi $TMP/$SPEC
-
-		rpmbuild -ba $TMP/$SPEC
+		
+		if [ "$RPMNAME" = "fedora" ]; then
+			rpmbuild -ba $TMP/$SPEC
+		elif [ "$RPMNAME" = "opensuse" ]; then
+			export RPM_BUILD_ROOT="$HOME/rpmbuild/BUILDROOT/gitso-0.6-1.i386"
+			rpmbuild -ba --buildroot=$RPM_BUILD_ROOT $TMP/$SPEC
+		fi
+		
 		find $RPM_BUILD_DIR/rpm/RPMS -name "*.rpm" -exec cp {} $RPMOUT ';'
 
 		echo -e " [done]\n"