diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/389-ds.spec b/389-ds.spec
index 7a6c4cb..5ef99cd 100644
--- a/389-ds.spec
+++ b/389-ds.spec
@@ -1,14 +1,12 @@
 Summary:          389 Directory, Administration, and Console Suite
 Name:             389-ds
-Version:          1.1.3
-Release:          5%{?dist}
+Version:          1.2.2
+Release:          1%{?dist}
 License:          GPLv2
 URL:              http://port389.org/
 Group:            System Environment/Daemons
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:        noarch
-Provides:         fedora-ds = %{version}-%{release}
-Obsoletes:        fedora-ds < 1.1.3-2
 
 Source:           LICENSE
 
@@ -44,8 +42,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
-* Wed Aug 12 2009 Rich Megginson <rmeggins@redhat.com> 1.1.3-5
-- added doc subpackages
+* Wed Jun  1 2011 Rich Megginson <rmeggins@redhat.com> 1.2.2-1
+- get rid of old fedora-ds stuff
+
+* Thu Apr 15 2010 Rich Megginson <rmeggins@redhat.com> 1.2.1-1
+- removed selinux subpackages - the selinux policy is now provided
+- by the main 389-ds-base and 389-admin packages
+
+* Mon Mar  2 2010 Rich Megginson <rmeggins@redhat.com> 1.2.0-1
+- added selinux subpackages
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 8cba13d..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: 389-ds
-# $Id$
-NAME := 389-ds
-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/import.log b/import.log
deleted file mode 100644
index d799f90..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-89-ds-1_1_3-2:HEAD:389-ds-1.1.3-2.src.rpm:1247865158