diff --git a/.gitignore b/.gitignore
index df4efcf..664f03a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1 @@
-gettext-0.18.1.1.tar.gz
-/gettext-0.18.2.tar.gz
-/gettext-0.18.2.1.tar.gz
-/gettext-0.18.3.tar.gz
-/gettext-0.18.3.1.tar.gz
-/gettext-0.18.3.2.tar.gz
-/gettext-0.19.tar.gz
-/gettext-0.19.1.tar.xz
-/gettext-0.19.2.tar.xz
-/gettext-0.19.3.tar.xz
+/gettext-0.*.tar.xz
diff --git a/disable-gettext-runtime-test-lock.patch b/disable-gettext-runtime-test-lock.patch
new file mode 100644
index 0000000..0660f1e
--- /dev/null
+++ b/disable-gettext-runtime-test-lock.patch
@@ -0,0 +1,26 @@
+Index: gettext-0.19.2/gettext-runtime/tests/Makefile.am
+===================================================================
+--- gettext-0.19.2.orig/gettext-runtime/tests/Makefile.am
++++ gettext-0.19.2/gettext-runtime/tests/Makefile.am
+@@ -19,7 +19,7 @@
+ AUTOMAKE_OPTIONS = 1.11 gnits no-dependencies color-tests subdir-objects
+ EXTRA_DIST =
+ 
+-TESTS = test-lock
++TESTS =
+ 
+ AM_CPPFLAGS = \
+   -I.. \
+Index: gettext-0.19.2/gettext-runtime/tests/Makefile.in
+===================================================================
+--- gettext-0.19.2.orig/gettext-runtime/tests/Makefile.in
++++ gettext-0.19.2/gettext-runtime/tests/Makefile.in
+@@ -77,7 +77,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-TESTS = test-lock$(EXEEXT)
++TESTS = 
+ noinst_PROGRAMS = test-lock$(EXEEXT)
+ subdir = tests
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
diff --git a/gettext.spec b/gettext.spec
index e8c3ca5..070e111 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -6,11 +6,15 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.19.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+ and LGPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/gettext/
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.xz
+# Disable the test_lock test as it often hangs on a number of arches
+# https://bugzilla.redhat.com/show_bug.cgi?id=1155291
+# http://savannah.gnu.org/bugs/?43487
+Patch0: disable-gettext-runtime-test-lock.patch
 Source2: msghack.py
 Source3: msghack.1
 # for bootstrapping
@@ -135,7 +139,7 @@ Emacs.
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .test_lock
 
 %build
 %if %{with java}
@@ -330,6 +334,9 @@ fi
 %{_emacs_sitelispdir}/%{name}/*.el
 
 %changelog
+* Tue Oct 28 2014 Peter Robinson <pbrobinson@fedoraproject.org> 0.19.3-2
+- Disable the test_lock test as it often hangs on a number of arches
+
 * Thu Oct 16 2014 Daiki Ueno <dueno@redhat.com> - 0.19.3-1
 - update to 0.19.3 release
 - remove patches included in 0.19.3