diff --git a/libdap-getopt.patch b/libdap-getopt.patch
new file mode 100644
index 0000000..64e9737
--- /dev/null
+++ b/libdap-getopt.patch
@@ -0,0 +1,48 @@
+diff -up libdap-3.13.1/unit-tests/DDSTest.cc.getopt libdap-3.13.1/unit-tests/DDSTest.cc
+--- libdap-3.13.1/unit-tests/DDSTest.cc.getopt	2014-02-04 15:30:33.000000000 -0700
++++ libdap-3.13.1/unit-tests/DDSTest.cc	2014-07-15 10:41:17.078813570 -0600
+@@ -496,7 +496,7 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
++    int option_char;
+     while ((option_char = getopt()) != EOF)
+         switch (option_char) {
+         case 'd':
+diff -up libdap-3.13.1/unit-tests/DDXParserTest.cc.getopt libdap-3.13.1/unit-tests/DDXParserTest.cc
+--- libdap-3.13.1/unit-tests/DDXParserTest.cc.getopt	2014-02-04 16:15:11.000000000 -0700
++++ libdap-3.13.1/unit-tests/DDXParserTest.cc	2014-07-15 10:35:11.120617282 -0600
+@@ -652,7 +652,7 @@ int main(int argc, char*argv[])
+ 	runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+ 	GetOpt getopt(argc, argv, "d");
+-	char option_char;
++	int option_char;
+ 	while ((option_char = getopt()) != EOF)
+ 		switch (option_char) {
+ 		case 'd':
+diff -up libdap-3.13.1/unit-tests/SequenceTest.cc.getopt libdap-3.13.1/unit-tests/SequenceTest.cc
+--- libdap-3.13.1/unit-tests/SequenceTest.cc.getopt	2014-07-15 10:42:22.638487942 -0600
++++ libdap-3.13.1/unit-tests/SequenceTest.cc	2014-07-15 10:42:33.222434496 -0600
+@@ -432,7 +432,7 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
++    int option_char;
+     while ((option_char = getopt()) != EOF)
+         switch (option_char) {
+         case 'd':
+diff -up libdap-3.13.1/unit-tests/ServerFunctionsListUnitTest.cc.getopt libdap-3.13.1/unit-tests/ServerFunctionsListUnitTest.cc
+--- libdap-3.13.1/unit-tests/ServerFunctionsListUnitTest.cc.getopt	2013-10-01 10:05:23.000000000 -0600
++++ libdap-3.13.1/unit-tests/ServerFunctionsListUnitTest.cc	2014-07-15 10:41:40.310697732 -0600
+@@ -183,7 +183,7 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
++    int option_char;
+     while ((option_char = getopt()) != EOF)
+         switch (option_char) {
+         case 'd':
diff --git a/libdap.spec b/libdap.spec
index 216d8f6..bc1d3ab 100644
--- a/libdap.spec
+++ b/libdap.spec
@@ -9,6 +9,9 @@ URL: http://www.opendap.org/
 Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz
 #Don't run HTTP tests - builders don't have network connections
 Patch0:  libdap-offline.patch
+# Fix test hangs on ppc and arm
+# https://bugzilla.redhat.com/show_bug.cgi?id=1118776
+Patch1:  libdap-getopt.patch
 
 # For autoreconf
 BuildRequires: libtool
@@ -62,6 +65,7 @@ Documentation of the libdap library.
 %prep
 %setup -q
 %patch0 -p1 -b .offline
+%patch1 -p1 -b .getopt
 iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
 touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
 mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
@@ -91,13 +95,8 @@ rm -f __dist_docs/html/*.map __dist_docs/html/*.md5
 touch -r ChangeLog __dist_docs/html/*
 
 
-# Fails to complete on arm - last message:
-# PASS: DASTest
-# https://bugzilla.redhat.com/show_bug.cgi?id=1118776
-%ifnarch armv7hl
 %check
 make check
-%endif
 
 
 %post -p /sbin/ldconfig
@@ -130,6 +129,9 @@ make check
 
 
 %changelog
+* Mon Jul 15 2014 Orion Poplawski <orion@cora.nwra.com> - 3.13.1-2
+- Add patch to fix tests on ppc and arm
+
 * Wed Jul 9 2014 Orion Poplawski <orion@cora.nwra.com> - 3.13.1-1
 - Update to 3.13.1
 - Run autoreconf to fix rpaths