diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index a13a1ce..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-sectool-0.7.0.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1fac123
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+sectool-0.8.5.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 460a38b..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: sectool
-# $Id$
-NAME := sectool
-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/sectool.spec b/sectool.spec
index 015800d..9d8a907 100644
--- a/sectool.spec
+++ b/sectool.spec
@@ -1,15 +1,13 @@
 Summary: A security audit system and intrusion detection system
 Name: sectool
-Version: 0.7.0
+Version: 0.8.5
 Release: 1%{?dist}
 URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart
 Source0: %{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: Applications/System
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildArch: noarch
-Requires: python2 gettext coreutils
-BuildRequires: desktop-file-utils gettext intltool
+Requires: python2 gettext coreutils rpm-python
+BuildRequires: desktop-file-utils gettext intltool rpm-devel asciidoc
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %package gui
@@ -44,8 +42,9 @@ desktop-file-install --delete-original      \
   --vendor=fedora \
    $RPM_BUILD_ROOT%{_datadir}/applications/sectool.desktop
 #adjust paths in sectool.conf
-sed -i 's,TESTS_DIRS=\(.*\),TESTS_DIRS=%{_datadir}/sectool/tests,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool.conf
-sed -i 's,TDATA_DIR_BASE=\(.*\),TDATA_DIR_BASE=%{_localstatedir}/lib/sectool,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool.conf
+sed -i 's,DSC_DIR=\(.*\),DSC_DIR=%{_sysconfdir}/sectool/tests,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool/sectool.conf
+sed -i 's,TESTS_DIRS=\(.*\),TESTS_DIRS=%{_datadir}/sectool/tests,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool/sectool.conf
+sed -i 's,TDATA_DIR_BASE=\(.*\),TDATA_DIR_BASE=%{_localstatedir}/lib/sectool,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool/sectool.conf
 
 #adjust icons path in guiOutput.py
 sed -i 's,__ico_path = \(.*\),__ico_path = "%{_datadir}/pixmaps/sectool/",' $RPM_BUILD_ROOT%{_datadir}/sectool/guiOutput.py
@@ -61,8 +60,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc COPYING AUTHORS README
-%config %{_sysconfdir}/sectool.conf
+%doc COPYING AUTHORS README doc/tests_documentation.html
+%config %{_sysconfdir}/sectool/
 %dir %{_localstatedir}/lib/sectool
 %dir %{_datadir}/sectool
 %{_sbindir}/sectool
@@ -93,6 +92,34 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 24 2008 Peter Vrabec <pvrabec@redhat.com> - 0.8.5-1
+- upgrade
+
+* Thu Jul 03 2008 Peter Vrabec <pvrabec@redhat.com> - 0.8.0-1
+- upgrade
+
+* Fri Jun 06 2008 Peter Vrabec <pvrabec@redhat.com> - 0.7.6-1
+- upgrade
+
+* Mon May 26 2008 Peter Vrabec <pvrabec@redhat.com> - 0.7.5-1
+- upgrade
+
+* Wed May 21 2008 Peter Vrabec <pvrabec@redhat.com> - 0.7.4-1
+- new upstream release, lots of fixes and improvements,
+  see changelog
+
+* Mon Apr 28 2008 Peter Vrabec <pvrabec@redhat.com> - 0.7.3-1
+- new upstream release
+- better test integration
+
+* Fri Apr 25 2008 Peter Vrabec <pvrabec@redhat.com> - 0.7.2-1
+- new upstream release
+- Support overriding level configuration in ~/.sectoolrc
+- Add saving level configuration in GUI:
+
+* Mon Apr 21 2008 Peter Vrabec <pvrabec@redhat.com> - 0.7.1-1
+- new upstream release
+
 * Tue Apr 08 2008 Peter Vrabec <pvrabec@redhat.com> - 0.7.0-1
 - new upstream release
 
diff --git a/sources b/sources
index ded1c4c..bd639f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e76c6dc4894e1e3179ae20b6d519fec  sectool-0.7.0.tar.bz2
+3e155945378b8c44ea0bff85fb66f38b  sectool-0.8.5.tar.bz2