diff --git a/.gitignore b/.gitignore
index 7609fec..27a8724 100644
--- a/.gitignore
+++ b/.gitignore
@@ -181,3 +181,4 @@
 /lorax-33.3.tar.gz
 /lorax-33.4.tar.gz
 /lorax-33.5.tar.gz
+/lorax-33.6.tar.gz
diff --git a/lorax.spec b/lorax.spec
index 60c0835..fa44ee9 100644
--- a/lorax.spec
+++ b/lorax.spec
@@ -3,8 +3,8 @@
 %define debug_package %{nil}
 
 Name:           lorax
-Version:        33.5
-Release:        2%{?dist}
+Version:        33.6
+Release:        1%{?dist}
 Summary:        Tool for creating the anaconda install images
 
 License:        GPLv2+
@@ -15,6 +15,7 @@ URL:            https://github.com/weldr/lorax
 # tito build --tgz
 Source0:        %{name}-%{version}.tar.gz
 
+# Temporary workaround - see rhbz#1848201
 # https://github.com/weldr/lorax/pull/1035
 # Ensure /proc exists before trying to touch /proc/modules
 Patch0:         0001-Ensure-proc-exists-before-trying-to-touch-proc-modul.patch
@@ -47,6 +48,7 @@ Requires:       pigz
 Requires:       pbzip2
 Requires:       dracut >= 030
 Requires:       kpartx
+Requires:       psmisc
 
 # Python modules
 Requires:       libselinux-python3
@@ -271,8 +273,11 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin
 %{_mandir}/man1/composer-cli.1*
 
 %changelog
-* Mon Jun 15 2020 Adam Williamson <awilliam@redhat.com> - 33.5-2
-- Backport PR#1035 to fix Rawhide composes (I hope)
+* Thu Jun 18 2020 Brian C. Lane <bcl@redhat.com> 33.6-1
+- lorax.spec: Add psmisc for fuser debugging of failed umounts in pylorax.imgutils (bcl@redhat.com)
+- composer-cli: Disable retry counter on connection timeout (bcl@redhat.com)
+- composer-cli: Change timeout to 5 minutes (bcl@redhat.com)
+- Temporary fix for running lorax inside mock (no /proc created)
 
 * Thu Jun 11 2020 Brian C. Lane <bcl@redhat.com> 33.5-1
 - lorax-composer: Add deprecation notice to documentation (bcl@redhat.com)
diff --git a/sources b/sources
index e573494..ef01791 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lorax-33.5.tar.gz) = 713decd7421af2e4728794a742d7bfc27282b14bc2f4d5ac6c90ccd1cdc3de4ac7e6587057ead5cd729f8b3a3ece886cb33883b7883172543cbdbc39092904d2
+SHA512 (lorax-33.6.tar.gz) = dc53607eddabc92d38d4382eae4d441b6a9501c1340abe8363a09836e77e5ebfa5c9fa3d6dbd85a1ebeb3b88822b038f872b51008acc0b0a4d7e9252d35b405e