diff --git a/.gitignore b/.gitignore
index 1975dbf..d8fc810 100644
--- a/.gitignore
+++ b/.gitignore
@@ -140,3 +140,4 @@
 /lorax-29.13.tar.gz
 /lorax-29.14.tar.gz
 /lorax-29.15.tar.gz
+/lorax-30.0.tar.gz
diff --git a/lorax.spec b/lorax.spec
index a2f11ba..1fe8e11 100644
--- a/lorax.spec
+++ b/lorax.spec
@@ -3,8 +3,8 @@
 %define debug_package %{nil}
 
 Name:           lorax
-Version:        29.15
-Release:        2%{?dist}
+Version:        30.0
+Release:        1%{?dist}
 Summary:        Tool for creating the anaconda install images
 
 Group:          Applications/System
@@ -15,10 +15,6 @@ URL:            https://github.com/weldr/lorax
 # git checkout -b archive-branch lorax-%%{version}-%%{release}
 # tito build --tgz
 Source0:        %{name}-%{version}.tar.gz
-# More DNF config interface shenanigans...
-# https://github.com/weldr/lorax/pull/480
-# https://bugzilla.redhat.com/show_bug.cgi?id=1595917
-Patch0:         0001-Don-t-try-to-append-to-DNF-config-value-that-can-t-t.patch
 
 BuildRequires:  python3-devel
 
@@ -160,7 +156,6 @@ build images, etc. from the command line.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
 
 %build
 
@@ -230,13 +225,44 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin
 %attr(0771, weldr, weldr) %{_sharedstatedir}/lorax/composer/blueprints/*
 
 %files -n composer-cli
-%{_bindir}/composer-cli
+%{_bindir}/composer
 %{python3_sitelib}/composer/*
-%{_sysconfdir}/bash_completion.d/composer-cli
+%{_sysconfdir}/bash_completion.d/composer
 
 %changelog
-* Wed Sep 26 2018 Adam Williamson <awilliam@redhat.com> - 29.15-2
-- Backport PR #480 for DNF 3.6 compatibility (RHBZ #1595917)
+* Tue Oct 02 2018 Brian C. Lane <bcl@redhat.com> 30.0-1
+- Add beakerlib to Dockerfile.test (bcl@redhat.com)
+- Adjust the new templates for locked root (bcl@redhat.com)
+- Adjust projects test for DNF 3.6.1 tuple issue (bcl@redhat.com)
+- Don't try to append to DNF config value that can't take it
+  (awilliam@redhat.com)
+- Always update repo metadata when building an image (bcl@redhat.com)
+- Add a test for repo metadata expiration (bcl@redhat.com)
+- Add tests for setting root password and ssh key with blueprints
+  (bcl@redhat.com)
+- Use rootpw for setting the root password instead of user (bcl@redhat.com)
+- Lock the root account, except on live-iso (bcl@redhat.com)
+- Add new compose types to compose sanity test (dshea@redhat.com)
+- Add virt guest agents to the qcow2 compose (dshea@redhat.com)
+- Add a vmdk compose type. (dshea@redhat.com)
+- Add a vhd compose type for Azure images (dshea@redhat.com)
+- Add an ami compose type for AWS images (dshea@redhat.com)
+- Remove --fstype from the generated part line (dshea@redhat.com)
+- Also run `make check` on travis (lars@karlitski.net)
+- Fix pylint errors and warnings (lars@karlitski.net)
+- New cli test covering basic compose commands (atodorov@redhat.com)
+- Update glusterfs to 5.* (atodorov@redhat.com)
+- Execute bash tests for composer-cli (atodorov@redhat.com)
+- Rename composer-cli to composer (lars@karlitski.net)
+- Include python3-pyatspi on boot.iso (#1506595) (bcl@redhat.com)
+- Start a HACKING.md file and document how to run the tests (stefw@redhat.com)
+- tests: Fix tests so they run on Fedora 28 (stefw@redhat.com)
+- Ignore files created by tests (stefw@redhat.com)
+- Makefile: Fix the 'make install' target (stefw@redhat.com)
+- Replace CJK fonts with Google Noto CJK (akira@tagoh.org)
+- Fix a DeprecationWarning (dshea@redhat.com)
+- Fix the expected versions of blueprint components (dshea@redhat.com)
+- Switch the test container back to rawhide (dshea@redhat.com)
 
 * Fri Sep 07 2018 Brian C. Lane <bcl@redhat.com> 29.15-1
 - Add a Makefile target for building html docs using a rawhide environment (bcl@redhat.com)
diff --git a/sources b/sources
index 707fc58..12fcdb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lorax-29.15.tar.gz) = 2e398b4bb5b25c43a26ebe5d11eb17c5472532d512908e5d1f0d301b1f142ddb3788f916c517d714f38fb9b507307a1d496de4f3c42a3cd0aff891aa2ee6dc1a
+SHA512 (lorax-30.0.tar.gz) = 4a284ab77a10ae2f9c77f4497a3593716de8e11e4a95e217ace9a1ac213f173ac46ac2e1c73590e09e321af19d08d6c6b3da60e24db4b3f567df8c2b0853063f