diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index dc0df2e..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-wordpress-mu-2.7.tar.gz
-wordpress-mu-2.8.2.tar.gz
-wordpress-mu-2.8.4a.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6ced768
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+wordpress-mu-2.9.1.1.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 70626f2..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: wordpress-mu
-# $Id$
-NAME := wordpress-mu
-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 83b639a..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-wordpress-mu-2_6_1-1_fc8:HEAD:wordpress-mu-2.6.1-1.fc8.src.rpm:1220452323
diff --git a/sources b/sources
index 5fcaff5..33adc56 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-b7d119c663833a3fe00d30224530447e  wordpress-mu-2.7.tar.gz
-5b412d16fdcc590698af565aa50d046c  wordpress-mu-2.8.2.tar.gz
-72dcdfaa60ede87d320b479579028d5e  wordpress-mu-2.8.4a.tar.gz
+85ffe0c80032257e99ca65c8fe978d3a  wordpress-mu-2.9.1.1.tar.gz
diff --git a/wordpress-mu.spec b/wordpress-mu.spec
index 741e55a..efc076a 100644
--- a/wordpress-mu.spec
+++ b/wordpress-mu.spec
@@ -1,7 +1,7 @@
 Summary: WordPress-MU multi-user blogging software
 URL: http://mu.wordpress.org/latest.tar.gz
 Name: wordpress-mu
-Version: 2.8.4a
+Version: 2.9.1.1
 Release: 1%{?dist}
 Group: Applications/Publishing
 License: GPLv2
@@ -99,6 +99,14 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/wordpress-mu
 
 %changelog
+* Fri Jan 29 2010 Bret McMillan <bretm@redhat.com> - 2.9.1.1-1
+- collected bug fixes and enhancements from wordpress 2.9.x merged into wpmu 2.9.1
+- Plugins options fix: http://trac.mu.wordpress.org/ticket/1193
+- wp_getUserBlogs fix: http://trac.mu.wordpress.org/ticket/1195
+
+* Mon Nov 30 2009 Bret McMillan <bretm@redhat.com> - 2.8.6-1
+- update to 2.8.6; couple of security fixes including 1 XSS
+
 * Wed Aug 12 2009 Bret McMillan <bretm@redhat.com> - 2.8.4a-1
 - Update to WordPress MU 2.8.4a; several security fixes included