diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index d5c6105..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-adminutil-1.1.5.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a590007
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+adminutil-1.1.5.tar.bz2
+adminutil-1.1.6.tar.bz2
+adminutil-1.1.7.tar.bz2
+adminutil-1.1.8.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index c2c5803..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: adminutil
-# $Id$
-NAME := adminutil
-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/adminutil.spec b/adminutil.spec
index d9fcd02..7f04e14 100644
--- a/adminutil.spec
+++ b/adminutil.spec
@@ -6,9 +6,9 @@
 
 Summary:          Utility library for directory server administration
 Name:             adminutil
-Version:          1.1.5
+Version:          1.1.8
 Release:          1%{?dist}
-License:          LGPL
+License:          LGPLv2
 URL:              http://directory.fedoraproject.org/wiki/AdminUtil
 Group:            Development/Libraries
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -84,6 +84,18 @@ that use %{name}.
 %{_includedir}/libadmsslutil
 
 %changelog
+* Tue Mar 31 2009 Rich Megginson <rmeggins@redhat.com> - 1.1.8-1
+- this is the 1.1.8 release
+
+* Wed Aug 27 2008 Rich Megginson <rmeggins@redhat.com> - 1.1.7-1
+- Resolves bug 454060   -  ViewLog CGI crash with new adminutil
+- Resolves bug 413531   -  Web browser accepted languages configuration causes dsgw CGI binaries to segfault
+
+* Mon Mar  3 2008 Rich Megginson <rmeggins@redhat.com> - 1.1.6-1
+- Resolves bug 245248 - dsgw doesn't escape filename in error message
+- The new dsgw hasn't been released yet, and the old one doesn't use
+- this code.
+
 * Thu Oct 18 2007 Rich Megginson <rmeggins@redhat.com> - 1.1.5-1
 - bump version to 1.1.5
 - fix icu linking issue
diff --git a/sources b/sources
index 43782b7..1a948da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1ce95159db07040d7095b805e9b3b533  adminutil-1.1.5.tar.bz2
+d45b1efc36e4c283f6d5131d061966bd  adminutil-1.1.8.tar.bz2