diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index afa25ee..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: wlassistant
-# $Id$
-NAME := wlassistant
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/sources b/sources
index 0935db7..dc28f30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1f30f1384b03662a9a0b75fa777f21d6  wlassistant-0.5.5.tar.bz2
+4623b498ac42839d08c631c500f18f8b  wlassistant-0.5.7.tar.bz2
diff --git a/wlassistant-0.5.6-devparsercleanup.patch b/wlassistant-0.5.6-devparsercleanup.patch
new file mode 100644
index 0000000..fb625f3
--- /dev/null
+++ b/wlassistant-0.5.6-devparsercleanup.patch
@@ -0,0 +1,18 @@
+--- wlassistant-0.5.6/src/wlassistant.cpp.BAD	2007-01-18 13:07:25.000000000 -0600
++++ wlassistant-0.5.6/src/wlassistant.cpp	2007-01-18 13:09:54.000000000 -0600
+@@ -1074,8 +1074,13 @@
+ 	QStringList ifList = QStringList();
+ 	for (int i = 0; i < c; i++) {
+ 		o = ol[i];
+-		if ( o.find("no wireless extensions")==-1 ) //string not found
+-			ifList << o.left(o.find("  "));
++		if ( o.find("no wireless extensions")==-1 ) {
++			if ( o.find("Warning:") == -1 ) {
++				QString interface = o.left(o.find(" "));
++				if ( interface.length() > 1 )
++					ifList << interface;
++			}
++		}
+ 	}
+ 	return ifList;
+ }
diff --git a/wlassistant.spec b/wlassistant.spec
index 75aa3ec..22a4f3d 100644
--- a/wlassistant.spec
+++ b/wlassistant.spec
@@ -1,7 +1,7 @@
 Name:		wlassistant
-Version:	0.5.5
-Release:	4%{?dist}
-License:	GPL
+Version:	0.5.7
+Release:	1%{?dist}
+License:	GPLv2+
 Group:		Applications/System
 Summary:	Wireless network management tool
 URL:		http://wlassistant.sourceforge.net
@@ -16,23 +16,22 @@ Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires:       usermode, wireless-tools, net-tools, dhclient
 Patch0:		wlassistant-0.5.5-rpath.patch
-Patch1:		wlassistant-0.5.5-devparsercleanup.patch
 
 %description
 Wireless Assistant (wlassistant) is a small application that allows you to 
 connect to wireless networks.
 
 MAIN FEATURES:
-- Managed Networks Support
+- WPA-PSK Encryption Support (WPA/WPA2)
 - WEP Encryption Support
 - Not Broadcasted ("hidden") ESSIDs Support
 - Per Network (AP) Configuration Profiles
 - Automatic (DHCP, both dhcpcd and dhclient) and manual configuration options.
+- Connection status monitoring
 
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"`
@@ -86,6 +85,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png
 
 %changelog
+* Tue Apr 10 2007 Tom "spot" Callaway <tcallawa@redhat.com> 0.5.7-1
+- 0.5.7
+
+* Thu Jan 18 2007 Tom "spot" Callaway <tcallawa@redhat.com> 0.5.6-1
+- bump to 0.5.6
+
 * Mon Sep 11 2006 Tom "spot" Callaway <tcallawa@redhat.com> 0.5.5-4
 - fix bz 205886