diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 6636d52..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-389-ds-console-1.2.0.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b31713d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+389-ds-console-1.2.3.tar.bz2
+/389-ds-console-1.2.4.tar.bz2
+/389-ds-console-1.2.5.tar.bz2
+/389-ds-console-1.2.6.tar.bz2
diff --git a/389-ds-console.spec b/389-ds-console.spec
index 861cf74..e1f3c4f 100644
--- a/389-ds-console.spec
+++ b/389-ds-console.spec
@@ -1,12 +1,12 @@
 %define major_version 1.2
-%define minor_version 0
+%define minor_version 6
 
 %define shortname 389-ds
 %define pkgname   dirsrv
 
 Name: 389-ds-console
 Version: %{major_version}.%{minor_version}
-Release: 6%{?dist}
+Release: 1%{?dist}
 Summary: 389 Directory Server Management Console
 
 Group: Applications/System
@@ -21,8 +21,6 @@ BuildRequires: ant >= 1.6.2
 BuildRequires: ldapjdk
 BuildRequires: idm-console-framework >= 1.1
 BuildRequires: java-devel >= 1:1.6.0
-Provides: fedora-ds-console = %{version}-%{release}
-Obsoletes: fedora-ds-console < 1.2.0-3
 %if 0%{?rhel} < 6
 ExcludeArch: ppc
 %endif
@@ -87,6 +85,40 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
                                                                                 
 %changelog
+* Fri Jun 17 2011 Rich Megginson <rmeggins@redhat.com> 1.2.6-1
+- git tag 389-ds-console-1.2.6
+- added skins support
+- Bug 700908 - Validate matching rules when creating a new attribute
+- Bug 705753 - Refresh problem in Console directory browser
+
+* Wed Mar 30 2011 Rich Megginson <rmeggins@redhat.com> 1.2.5-1
+- the 1.2.5 release - git tag 389-ds-console-1.2.5
+- Bug 616707 - Add attribute matching rule UI to Console
+- Bug 533505 - Warn about CA cert trust when enabling SSL in Console
+- Bug 158262 - Windows Sync UI is inconistent
+- Bug 504803 - Allow nsslapd-*-logmaxdiskspace to be set to -1 in UI
+- Bug 474113 - Allow access log level to be configured from Console
+- Bug 229693 - Update naming attribute when objectclass is removed
+- Bug 211296 - Clean up all HTML pages (Admin Express, Repl Monitor, etc)
+
+* Wed Feb 23 2011 Rich Megginson <rmeggins@redhat.com> 1.2.4-1
+- the 1.2.4 release - git tag 389-ds-console-1.2.4
+- Bug 450016 - RFE- Console display values in KB/MB/GB
+- Bug 387981 - plain files can be chosen on the Restore Directory dialog
+- Bug 661116 - 389-console Configuration tab admin permissions (nsslapd-referral ?) and folder not expending immediatly
+- Bug 151705 - Need to update Console Cipher Preferences with new ciphers
+- Bug 553066 - Directory Console: do not display "subtree" index type
+- Bug 599732 - Root node in directory browser shows DN syntax error
+
+* Thu May 13 2010 Rich Megginson <rmeggins@redhat.com> 1.2.3-1
+- the 1.2.3 release
+
+* Fri Apr 30 2010 Rich Megginson <rmeggins@redhat.com> 1.2.2-1
+- the 1.2.2 release
+
+* Thu Apr 15 2010 Rich Megginson <rmeggins@redhat.com> 1.2.1-1
+- the 1.2.1 release
+
 * Fri Dec 18 2009 Rich Megginson <rmeggins@redhat.com> - 1.2.0-6
 - Excluding PPC for EPEL builds as there is not openjdk there
 
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 488a446..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: 389-ds-console
-# $Id: Makefile,v 1.1 2009/07/17 20:49:57 ausil Exp $
-NAME := 389-ds-console
-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 $$d/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 63fa288..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-89-ds-console-1_2_0-3:HEAD:389-ds-console-1.2.0-3.src.rpm:1247864626
diff --git a/sources b/sources
index fa91f69..2621309 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a856772523e5a331e1c407545ee3cfc  389-ds-console-1.2.0.tar.bz2
+c53161badabc0715f78bdcefee810c40  389-ds-console-1.2.6.tar.bz2