diff --git a/mod_auth_openidc.spec b/mod_auth_openidc.spec
index 4e6a3f2..8c5bf7f 100644
--- a/mod_auth_openidc.spec
+++ b/mod_auth_openidc.spec
@@ -2,6 +2,12 @@
 %{!?_httpd_moddir: %{expand: %%global _httpd_moddir %%{_libdir}/httpd/modules}}
 %{!?_httpd_confdir: %{expand: %%global _httpd_confdir %{_sysconfdir}/httpd/conf.d}}
 
+# Optionally build with hiredis if --with hiredis is passed
+%{!?_with_hiredis: %{!?_without_hiredis: %global _without_hiredis --without-hiredis}}
+# It is an error if both or neither required options exist.
+%{?_with_hiredis: %{?_without_hiredis: %{error: both _with_hiredis and _without_hiredis}}}
+%{!?_with_hiredis: %{!?_without_hiredis: %{error: neither _with_hiredis nor _without_hiredis}}}
+
 # /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4
 %{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}}
 
@@ -9,7 +15,7 @@
 
 Name:		mod_auth_openidc
 Version:	1.8.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	OpenID Connect auth module for Apache HTTP Server
 
 Group:		System Environment/Daemons
@@ -21,10 +27,10 @@ BuildRequires:	httpd-devel
 BuildRequires:	openssl-devel
 BuildRequires:	curl-devel
 BuildRequires:	jansson-devel
-BuildRequires:	hiredis-devel
 BuildRequires:	pcre-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
+%{?_with_hiresdis:BuildRequires: hiresdis-devel}
 Requires:	httpd-mmn = %{_httpd_mmn}
 
 %description
@@ -39,7 +45,10 @@ an OpenID Connect Relying Party and/or OAuth 2.0 Resource Server.
 export APXS2_OPTS='-S LIBEXECDIR=${MODULES_DIR}'
 export MODULES_DIR=%{_httpd_moddir}
 autoreconf
-%configure
+%configure \
+  %{?_with_hiredis} \
+  %{?_without_hiredis}
+
 make %{?_smp_mflags}
 
 %install
@@ -77,6 +86,9 @@ install -m 700 -d $RPM_BUILD_ROOT%{httpd_pkg_cache_dir}/cache
 %dir %attr(0700, apache, apache) %{httpd_pkg_cache_dir}/cache
 
 %changelog
+* Wed Mar 23 2016 John Dennis <jdennis@redhat.com> - 1.8.8-2
+- Make building with redis support optional (defaults to without)
+
 * Mon Mar 21 2016 John Dennis <jdennis@redhat.com> - 1.8.8-1
 - Update to 1.8.8 (#1316528)
 - Add missing unpackaged files/directories