diff --git a/amanda-3.4.2-planner-segfault.patch b/amanda-3.4.2-planner-segfault.patch
new file mode 100644
index 0000000..a2743ef
--- /dev/null
+++ b/amanda-3.4.2-planner-segfault.patch
@@ -0,0 +1,12 @@
+--- a/server-src/tapefile.c	
++++ a/server-src/tapefile.c	
+@@ -1199,8 +1199,7 @@ nb_tape_in_storage(
+     int nb_tapes = 0;
+ 
+     for (tp = tape_list; tp != NULL; tp = tp->next) {
+-	if (tp->storage &&
+-	    g_str_equal(storage_name, tp->storage)) {
++	if (g_strcmp0(storage_name,tp->storage) == 0) {
+ 	    nb_tapes++;
+ 	}
+     }
diff --git a/amanda.spec b/amanda.spec
index 9d5182c..0e57297 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -10,7 +10,7 @@
 Summary:       A network-capable tape backup solution
 Name:          amanda
 Version:       3.4.2
-Release:       1%{?dist}
+Release:       2%{?dist}
 Source:        http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1:       amanda.crontab
 Source4:       disklist
@@ -31,6 +31,8 @@ Patch4:        amanda-3.3.9-hash-permission.patch
 # Fails to build on non-x86 due to sse-related things.  This patch comes from
 # upstream.
 Patch5:        amanda-3.4.2-fix-sse.patch
+# Patch from upstream to fix segfault in planner.
+Patch6:        amanda-3.4.2-planner-segfault.patch
 
 License:       BSD and GPLv3+ and GPLv2+ and GPLv2
 Group:         Applications/System
@@ -440,6 +442,10 @@ make check
 
 
 %changelog
+* Mon Feb 20 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.4.2-2
+- Add patch from upstream to fix a segfault in planner.  Hopefully fixes
+  https://bugzilla.redhat.com/show_bug.cgi?id=1423471
+
 * Tue Jan 31 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.4.2-1
 - Update to 3.4.2.
 - Remove upstreamed patches.