diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 2af306e..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-389-adminutil-1.1.9.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8951ced
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+389-adminutil-1.1.14.tar.bz2
+/389-adminutil-1.1.15.tar.bz2
+/389-adminutil-1.1.17.tar.bz2
+/389-adminutil-1.1.18.tar.bz2
+/389-adminutil-1.1.19.tar.bz2
+/389-adminutil-1.1.20.tar.bz2
diff --git a/389-adminutil.spec b/389-adminutil.spec
index 234e005..c8ba34e 100644
--- a/389-adminutil.spec
+++ b/389-adminutil.spec
@@ -1,6 +1,6 @@
 Summary:          Utility library for 389 administration
 Name:             389-adminutil
-Version:          1.1.9
+Version:          1.1.20
 Release:          1%{?dist}
 License:          LGPLv2
 URL:              http://port389.org/wiki/AdminUtil
@@ -82,6 +82,43 @@ that use %{name}.
 %{_includedir}/libadmsslutil
 
 %changelog
+* Wed Mar 19 2014 Rich Megginson <rmeggins@redhat.com> - 1.1.20-1
+- Ticket #47680 Upgraded 389-admin rpms and now I can't start dirsrv-admin
+
+* Wed Nov 20 2013 Rich Megginson <rmeggins@redhat.com> - 1.1.19-1
+- Ticket #47415 "Manage certificates" crashes admin server
+- 8647ad8 fix compiler warnings - enhancements to test ticket 47415
+
+* Mon Aug 19 2013 Rich Megginson <rmeggins@redhat.com> - 1.1.18-1
+- ee1ef81 add Eclipse generated files
+- Ticket #47486 - compiler warnings in adminutil, admin, dsgw
+- 77fd77a fix mem leak in admldapBuildInfoSSL when there is no password
+
+* Fri Apr 19 2013 Noriko Hosoi <nhosoi@redhat.com> - 1.1.17-1
+-bump version to 1.1.17
+Resolves: Bug 856089 - slapi_ldap_bind() doesn't check bind results (Ticket 479 - Console logins fail intermittenly)
+Resolves: Bug 905266 - BIND operation result not checked properly in admin server and adminutil
+
+* Fri Feb  3 2012 Rich Megginson <rmeggins@redhat.com> - 1.1.15-1
+- Ticket #281 - TLS not working with latest openldap
+- Ticket #161 - Review and address latest Coverity issues
+
+* Tue May 31 2011 Rich Megginson <rmeggins@redhat.com> - 1.1.14-1
+- many fixes for coverity issues
+
+* Fri Oct 22 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.13-1
+- add nss_inc to libadminutil build flags
+
+* Tue Oct 19 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.12-1
+- fix building with mozldap
+
+* Tue Oct 19 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-1
+- the 1.1.11 release
+
+* Fri Feb 26 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.10-1
+- Bug 460168 - FedoraDS' adminutil requires non-existent "icu.pc" on non-RH/Fedora systems
+- this is the 1.1.10 release
+
 * Thu Jan 14 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.9-1
 - make sure we can find ICU genrb on all platforms
 - this is the 1.1.9 release
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 7e6071f..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: 389-adminutil
-# $Id$
-NAME := 389-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 $$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 586a4ff..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-89-adminutil-1_1_8-2:HEAD:389-adminutil-1.1.8-2.src.rpm:1247864461
diff --git a/sources b/sources
index 1c3bea3..47b9d93 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-da96a9673ac983b79475fd9c51b663c3  389-adminutil-1.1.9.tar.bz2
+e29a4eee7578ea51f59c0e76c5899377  389-adminutil-1.1.20.tar.bz2