diff --git a/.cvsignore b/.cvsignore
index f9e0cd7..8bb102c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-koji-1.3.2.tar.bz2
+koji-1.4.0.tar.bz2
diff --git a/fedora-config.patch b/fedora-config.patch
index 69816a2..a5bf323 100644
--- a/fedora-config.patch
+++ b/fedora-config.patch
@@ -1,5 +1,5 @@
---- koji-1.2.2/cli/koji.conf.orig	2007-06-05 15:28:12.751753000 -0400
-+++ koji-1.2.2/cli/koji.conf	2007-06-05 15:30:48.710640000 -0400
+--- koji-1.4.0/cli/koji.conf.orig	2010-07-08 21:04:26.000000000 -0500
++++ koji-1.4.0/cli/koji.conf	2010-07-09 10:21:24.000000000 -0500
 @@ -3,24 +3,24 @@
  ;configuration for koji cli tool
  
@@ -19,7 +19,7 @@
 -;topdir = /mnt/koji
 +topdir = /mnt/koji
  
- ;configuration for SSL athentication
+ ;configuration for SSL authentication
  
  ;client certificate
 -;cert = ~/.koji/client.crt
@@ -27,7 +27,7 @@
  
  ;certificate of the CA that issued the client certificate
 -;ca = ~/.koji/clientca.crt
-+ca = ~/.fedora-upload-ca.cert
++ca = ~/.fedora-server-ca.cert
  
  ;certificate of the CA that issued the HTTP server certificate
 -;serverca = ~/.koji/serverca.crt
diff --git a/koji.spec b/koji.spec
index 70853c1..b854c4d 100644
--- a/koji.spec
+++ b/koji.spec
@@ -1,9 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name: koji
-Version: 1.3.2
+Version: 1.4.0
 Release: 1%{?dist}
-License: LGPLv2
+License: LGPLv2 and GPLv2+
+# koji.ssl libs (from plague) are GPLv2+
 Summary: Build system tools
 Group: Applications/System
 URL: http://fedorahosted.org/koji
@@ -46,6 +47,8 @@ Plugins to the koji XMLRPC interface
 %package builder
 Summary: Koji RPM builder daemon
 Group: Applications/System
+License: LGPLv2 and GPLv2+
+#mergerepos (from createrepo) is GPLv2+
 Requires: %{name} = %{version}-%{release}
 Requires: mock >= 0.9.14
 Requires(post): /sbin/chkconfig
@@ -60,10 +63,10 @@ Requires: rpm-build
 Requires: redhat-rpm-config
 Requires: pykickstart                                                                               
 Requires: pycdio   
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 5
 Requires: createrepo >= 0.9.6
 %endif
-%if 0%{?rhel}
+%if 0%{?rhel} == 5
 Requires: python-createrepo >= 0.9.6
 Requires: python-hashlib
 Requires: createrepo
@@ -127,6 +130,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir %{_prefix}/lib/koji-hub-plugins
 %{_prefix}/lib/koji-hub-plugins/*.py*
+%dir %{_sysconfdir}/koji-hub/plugins/
+%config(noreplace) %{_sysconfdir}/koji-hub/plugins/messagebus.conf
 
 %files utils
 %defattr(-,root,root)
@@ -181,6 +186,27 @@ if [ $1 = 0 ]; then
 fi
 
 %changelog
+* Fri Jul 09 2010 Dennis Gilmore <dennis@ausil.us> - 1.4.0-1
+- update to 1.4.0
+- Merge mead branch: support for building jars with Maven *
+- support for building appliance images *
+- soft dependencies for LiveCD/Appliance features
+- smarter prioritization of repo regenerations
+- package list policy to determine if package list changes are allowed
+- channel policy to determine which channel a task is placed in
+- edit host data via webui
+- description and comment fields for hosts *
+- cleaner log entries for kojihub
+- track user data in versioned tables *
+- allow setting retry parameters for the cli
+- track start time for tasks *
+- allow packages built from the same srpm to span multiple external repos
+- make the command used to fetch sources configuable per repo
+- kojira: remove unexpected directories
+- let kojid to decide if it can handle a noarch task
+- avoid extraneous ssl handshakes
+- schema changes to support starred items
+
 * Fri Nov 20 2009 Dennis Gilmore <dennis@ausil.us> - 1.3.2-1
 - update to 1.3.2
 
diff --git a/sources b/sources
index a72961d..8dfdcc5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c776f838f126276269e4bba2c2cea097  koji-1.3.2.tar.bz2
+182584f02660cd574714f55fe49333a3  koji-1.4.0.tar.bz2