diff --git a/augeas.spec b/augeas.spec
index 6ff0c4d..ec29893 100644
--- a/augeas.spec
+++ b/augeas.spec
@@ -1,5 +1,5 @@
 Name:           augeas
-Version:        1.5.0
+Version:        1.8.1
 Release:        1%{?dist}
 Summary:        A library for changing configuration files
 
@@ -7,8 +7,8 @@ Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://augeas.net/
 Source0:        http://download.augeas.net/%{name}-%{version}.tar.gz
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Disable gnulib test-lock, which hangs during check (related to BZ#1410052, BZ#1406031)
+Patch0:         gnulib-disable-test-lock.patch
 
 BuildRequires:  readline-devel libselinux-devel libxml2-devel
 Requires:       %{name}-libs = %{version}-%{release}
@@ -48,6 +48,7 @@ read files.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -91,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(-,root,root,-)
-# %{_datadir}/augeas and %{_datadir}/augeas/lenses are owned
+# _datadir/augeas and _datadir/augeas/lenses are owned
 # by filesystem.
 %{_datadir}/augeas/lenses/dist
 %{_libdir}/*.so.*
@@ -105,6 +106,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Thu Aug 24 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-1
+- New upstream version 1.8.1.
+- Fixes CVE-2017-7555 (RHBZ#1482340).
+
+* Tue Mar 21 2017 Dominic Cleal <dominic@cleal.org> - 1.8.0-1
+- Update to 1.8.0
+
+* Wed Nov 09 2016 Dominic Cleal <dominic@cleal.org> - 1.7.0-1
+- Update to 1.7.0
+
+* Mon Aug 08 2016 Dominic Cleal <dominic@cleal.org> - 1.6.0-1
+- Update to 1.6.0
+
 * Thu May 12 2016 Dominic Cleal <dominic@cleal.org> - 1.5.0-1
 - Update to 1.5.0
 
diff --git a/gnulib-disable-test-lock.patch b/gnulib-disable-test-lock.patch
new file mode 100644
index 0000000..43d1b15
--- /dev/null
+++ b/gnulib-disable-test-lock.patch
@@ -0,0 +1,40 @@
+diff -ru augeas-1.8.0.old/gnulib/tests/Makefile.am augeas-1.8.0/gnulib/tests/Makefile.am
+--- augeas-1.8.0.old/gnulib/tests/Makefile.am	2016-09-29 20:15:19.000000000 +0100
++++ augeas-1.8.0/gnulib/tests/Makefile.am	2017-03-21 15:14:45.209782946 +0000
+@@ -515,15 +515,6 @@
+ 
+ ## end   gnulib module localename-tests
+ 
+-## begin gnulib module lock-tests
+-
+-TESTS += test-lock
+-check_PROGRAMS += test-lock
+-test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
+-EXTRA_DIST += test-lock.c
+-
+-## end   gnulib module lock-tests
+-
+ ## begin gnulib module lstat-tests
+ 
+ TESTS += test-lstat
+diff -ru augeas-1.8.0.old/gnulib/tests/Makefile.in augeas-1.8.0/gnulib/tests/Makefile.in
+--- augeas-1.8.0.old/gnulib/tests/Makefile.in	2017-03-20 22:17:04.000000000 +0000
++++ augeas-1.8.0/gnulib/tests/Makefile.in	2017-03-21 15:15:05.211646356 +0000
+@@ -126,7 +126,7 @@
+ 	test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \
+ 	test-limits-h$(EXEEXT) test-locale$(EXEEXT) \
+ 	test-localeconv$(EXEEXT) test-localename$(EXEEXT) \
+-	test-lock$(EXEEXT) test-lstat$(EXEEXT) test-malloca$(EXEEXT) \
++	test-lstat$(EXEEXT) test-malloca$(EXEEXT) \
+ 	test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \
+ 	test-mbrtowc4.sh test-mbrtowc5.sh test-mbrtowc-w32-1.sh \
+ 	test-mbrtowc-w32-2.sh test-mbrtowc-w32-3.sh \
+@@ -170,7 +170,7 @@
+ 	test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \
+ 	test-limits-h$(EXEEXT) test-locale$(EXEEXT) \
+ 	test-localeconv$(EXEEXT) test-localename$(EXEEXT) \
+-	test-lock$(EXEEXT) test-lstat$(EXEEXT) test-malloca$(EXEEXT) \
++	test-lstat$(EXEEXT) test-malloca$(EXEEXT) \
+ 	test-mbrtowc$(EXEEXT) test-mbrtowc-w32$(EXEEXT) \
+ 	test-mbsinit$(EXEEXT) test-mbsrtowcs$(EXEEXT) \
+ 	test-memchr$(EXEEXT) test-nl_langinfo$(EXEEXT) \
diff --git a/sources b/sources
index fbf9bcc..7932203 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-01190e455c513124a2dae29a1182c113  augeas-1.5.0.tar.gz
+SHA512 (augeas-1.8.1.tar.gz) = 80be6dc75e86e2a00c56cb668824ffbe54105b64fad64a2737d980c8ee5ba347a97ddd190a1c712bd07a768ed23a8d07b0eb676033b367632036a8e7f98c976b