diff --git a/amanda-3.4.1-support-old-clients.patch b/amanda-3.4.1-support-old-clients.patch
deleted file mode 100644
index 332f302..0000000
--- a/amanda-3.4.1-support-old-clients.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/server-src/diskfile.c b/server-src/diskfile.c
-index ffee14e..929c05e 100644
---- a/server-src/diskfile.c
-+++ b/server-src/diskfile.c
-@@ -1178,6 +1178,11 @@ char *optionstr(disk_t *dp)
-     g_assert(dp != NULL);
-     g_assert(dp->host != NULL);
- 
-+    /* An empty element at the beginning ensures that the final options string
-+     * begins with a semicolon.  This helps to prevent breakage when talking to
-+     * very old clients. */
-+    g_ptr_array_add(array, g_strdup(""));
-+
-     their_features = dp->host->features;
- 
-     if (am_has_feature(their_features, fe_options_auth))
-diff --git a/server-src/dumper.c b/server-src/dumper.c
-index 0e31e50..78545a8 100644
---- a/server-src/dumper.c
-+++ b/server-src/dumper.c
-@@ -3685,7 +3685,7 @@ startup_dump(
-         g_string_append(reqbuf, pclean);
- 	g_free(pclean);
- 	dle_str = p;
--    } else if (legacy_api) {
-+    } else if (!legacy_api) {
- 	g_free(errstr);
- 	errstr = g_strdup("[does not support application-api]");
-         g_string_free(reqbuf, TRUE);
diff --git a/amanda.spec b/amanda.spec
index d3d45f4..9efd50e 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -9,8 +9,8 @@
 
 Summary:       A network-capable tape backup solution
 Name:          amanda
-Version:       3.4.1
-Release:       3%{?dist}
+Version:       3.4.2
+Release:       1%{?dist}
 Source:        http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1:       amanda.crontab
 Source4:       disklist
@@ -28,7 +28,6 @@ Patch2:        amanda-3.1.1-tcpport.patch
 Patch3:        amanda-3.2.0-config-dir.patch
 #Bugfix - solved problem with permission error message (#1257686)
 Patch4:        amanda-3.3.9-hash-permission.patch
-Patch5:        amanda-3.4.1-support-old-clients.patch
 
 License:       BSD and GPLv3+ and GPLv2+ and GPLv2
 Group:         Applications/System
@@ -108,11 +107,11 @@ server also needs to have the amanda-client package installed.
 
 %prep
 %autosetup -p1 -n %{name}-%{version}
-./autogen
 
 %build
-export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS=-pie
+./autogen
 
+export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS=-pie
 %configure --enable-shared \
            --disable-rpath \
            --disable-static \
@@ -442,6 +441,11 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Tue Jan 31 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.4.2-1
+- Update to 3.4.2.
+- Remove upstreamed patch.
+- Move autogen call from %%prep to %%build.
+
 * Fri Jan 13 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.4.1-3
 - Add patch to avoid breakage with RHEL5 clients.
 
diff --git a/sources b/sources
index 4714be9..285bc00 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-280304272c056813e127f6d2a1b2d0ed  amanda-3.4.1.tar.gz
+SHA512 (amanda-3.4.2.tar.gz) = dea44ffa5eb30318336395ccbd582df2f83da9a4cf91def2834a2e65b2e0f36cafc1911f6b73c3afb63be256484a78b006bdeb1db5b3ecf87dc59d34754987fd