diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 61eeb27..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-seedit-2.1.0.tar.gz
-seedit-2.1.1.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1118862
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+seedit-2.2.0.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 69a289d..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: seedit
-# $Id$
-NAME := seedit
-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/seedit.spec b/seedit.spec
index fb082e8..ef58ca7 100644
--- a/seedit.spec
+++ b/seedit.spec
@@ -12,11 +12,11 @@
 #Whether audit support obj_type field, after FC6 "y"
 %define audit_obj_type_support  y
 #Version of sample policy file
-%define sample_policy_type fc6
+%define sample_policy_type f8
 
 Name: seedit         
-Version: 2.1.1
-Release: 3%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}.1
 Summary: SELinux Policy Editor:Core component
 Group:  System Environment/Base        
 License: GPL       
@@ -24,10 +24,9 @@ URL: http://seedit.sourceforge.net/
 Source0: http://osdn.dl.sourceforge.jp/selpe/23577/%{name}-%{version}.tar.gz
 Source1: seedit-gui.desktop
 Source2: seedit-gui.png
-Patch:   2.1.1-2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{betatag}-root-%(%{__id_u} -n)
-BuildRequires:  libselinux-devel >= 1.19, libsepol-devel >= 1.1.1, byacc, flex
-Requires:  checkpolicy, m4, audit, libselinux >= 1.19, libsepol >= 1.1.1
+BuildRequires:  libselinux-devel >= 1.19, byacc, flex
+Requires:  checkpolicy, m4, audit, libselinux >= 1.19
 Provides: seedit-converter = %{version}-%{release}
 
 %description
@@ -41,7 +40,7 @@ Command line utils is included in seedit package.
 
 %prep
 %setup -q
-%patch -p0
+#%patch -p0
 
 %build
 pushd core
@@ -126,6 +125,7 @@ if [ $1 = 0 ]; then
 	if [ %{selinuxenabled} ]; then
 		sed -i 's/^SELINUX=.*/SELINUX=permissive/g' %{_sysconfdir}/selinux/config
 	fi
+	sed -i '/# Added by seedit/,/# End of seedit/ d' %{auditrules}
 	touch /.autorelabel
 fi
 
@@ -134,6 +134,7 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/policy
 %config(noreplace) %{_sysconfdir}/selinux/%{name}
 %{_datadir}/%{name}/initialize/
+%{_datadir}/%{name}/base_policy/dynamic_contexts
 %{_sbindir}/seedit-init
 %ghost %{_datadir}/%{name}/sepolicy/need-init
 %ghost %{_datadir}/%{name}/sepolicy/need-rbac-init
@@ -143,7 +144,6 @@ Summary: GUI for SELinux Policy Editor
 Group: System Environment/Base
 Requires: usermode
 Requires: pygtk2
-Requires: pam >= 0.80-9
 BuildRequires: desktop-file-utils
 BuildRequires:  gettext
 Requires: %{name} = %{version}-%{release}, %{name}-policy = %{version}-%{release}
@@ -170,6 +170,11 @@ X based GUI for SELinux Policy Editor
 
 
 %changelog
+* Tue Oct 30 2007 Yuichi Nakamura <ynakam@hitachisoft.jp> 2.2.0-1
+- Version 2.2.0, works on F8.
+- Removed libsepol from requires and buildrequires.
+- In uninstall time, unneeded rules are removed from audit.rules.
+
 * Tue Aug 28 2007 Jesse Keating <jkeating@redhat.com> 2.1.1-3
 - Rebuild for ppc32 selinux issue.
 
diff --git a/sources b/sources
index 13ccf28..85404a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a380b9e2cb67c5d89fd28bdca63b330a  seedit-2.1.1.tar.gz
+cc89f85350b062318a1a4f527e206801  seedit-2.2.0.tar.gz