diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 4acd601..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-abook-0.5.6.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5a22f21
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+abook-0.6.0pre2.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index e9c6aa3..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: abook
-# $Id$
-NAME := abook
-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/abook.spec b/abook.spec
index 44c5d9f..a2d976e 100644
--- a/abook.spec
+++ b/abook.spec
@@ -1,15 +1,16 @@
 Name: abook
-Version: 0.5.6
-Release: 3%{?dist}
+Version: 0.6.0
+Release: 0.1.pre2%{?dist}
 License: GPL
 URL: http://abook.sourceforge.net/
 Summary: Text-based addressbook program for mutt
 Group: Applications/Productivity
-Source: http://dl.sourceforge.net/sourceforge/abook/%{name}-%{version}.tar.gz
+#Source: http://dl.sourceforge.net/sourceforge/abook/%{name}-%{version}.tar.gz
+Source: http://abook.sourceforge.net/devel/abook-0.6.0pre2.tar.gz
 BuildRequires: gettext
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
-Requires: lynx
+Requires: webclient
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -17,10 +18,9 @@ Abook is a small and powerful text-based addressbook program
 designed for use with the mutt mail client.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}pre2
 
 %build
-export LDFLAGS=-L%{_libdir}
 %configure
 %{__make} %{?_smp_mflags}
 
@@ -35,13 +35,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(0644,root,root,0755)
-%doc AUTHORS BUGS ChangeLog README THANKS TODO sample.abookrc FAQ NEWS ANNOUNCE
-%doc COPYING
+%doc AUTHORS BUGS COPYING ChangeLog FAQ README RELEASE_NOTES THANKS TODO sample.abookrc
 %attr(0755,root,root) %{_bindir}/abook
 %{_mandir}/man1/abook.*
 %{_mandir}/man5/abookrc.*
 
 %changelog
+* Sun Apr 29 2007 Dominik Mierzejewski <rpm@greysector.net> 0.6.0-0.1.pre2
+- latest devel version
+- specfile cleanups
+
 * Mon Aug 28 2006 Dominik Mierzejewski <rpm@greysector.net> 0.5.6-3
 - mass rebuild
 
diff --git a/sources b/sources
index 3b54f54..9805982 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87d25df96864a7c507a4965e6d1da49d  abook-0.5.6.tar.gz
+1e4a7210b3507db7b3d47ee7a2457934  abook-0.6.0pre2.tar.gz