diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 8805f0c..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-389-admin-console-1.1.4.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0ec8040
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+389-admin-console-1.1.5.tar.bz2
+/389-admin-console-1.1.6.tar.bz2
+/389-admin-console-1.1.7.tar.bz2
+/389-admin-console-1.1.8.tar.bz2
diff --git a/389-admin-console.spec b/389-admin-console.spec
index 9062537..00a3cca 100644
--- a/389-admin-console.spec
+++ b/389-admin-console.spec
@@ -1,12 +1,12 @@
 %define major_version 1.1
-%define minor_version 4
+%define minor_version 8
 
 %define shortname 389-admin
 %define pkgname dirsrv
 
 Name: 389-admin-console
 Version: %{major_version}.%{minor_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: 389 Admin Server Management Console
 
 Group: Applications/System
@@ -23,6 +23,10 @@ BuildRequires: idm-console-framework
 BuildRequires: java-devel >= 1:1.6.0
 Provides: fedora-ds-admin-console = %{version}-%{release}
 Obsoletes: fedora-ds-admin-console < 1.1.4-1
+%if 0%{?rhel} < 6
+ExcludeArch: ppc
+%endif
+
 
 %description
 A Java based remote management console used for Managing 389
@@ -83,6 +87,26 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html
 
 %changelog
+* Tue Aug  9 2011 Rich Megginson <rmeggins@redhat.com> - 1.1.8-1
+- Bug 723126 - Configure Admin Server -> Connection Restriction --> Add Screen is flicking consistently.
+
+* Wed Mar 30 2011 Rich Megginson <rmeggins@redhat.com> - 1.1.7-1
+- the 1.1.7 release - git tag 389-admin-console-1.1.7
+- Bug 476925 - Admin Server: Do not allow 8-bit passwords for
+-     the admin user
+- Bug 211296 - Clean up all HTML pages (Admin Express, Repl Monitor, etc)
+
+* Wed Feb 23 2011 Rich Megginson <rmeggins@redhat.com> - 1.1.6-1
+- the 1.1.6 release - git tag 389-admin-console-1.1.6
+- Bug 668950 - Add posix group support to Console
+- Bug 151705 - Need to update Console Cipher Preferences with new ciphers
+ 
+* Wed Jun  2 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.5-1
+- the 1.1.5 release
+
+* Wed Nov 04 2009 Michael Stahnke <stahnma@fedoraproject.org> - 1.1.4-3
+- ExcludeArch ppc due to no openjdk, thus no idm-console-framework
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 3a6f205..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: 389-admin-console
-# $Id$
-NAME := 389-admin-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 $$/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 09c8bf4..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-89-admin-console-1_1_4-1:HEAD:389-admin-console-1.1.4-1.src.rpm:1247850936
diff --git a/sources b/sources
index 7423bfb..2f77179 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-55c661be949c27b9ff2f754abbc2607f  389-admin-console-1.1.4.tar.bz2
+7228ce57aa01fb8321a083f676de32f4  389-admin-console-1.1.8.tar.bz2