diff --git a/.gitignore b/.gitignore
index 9243c59..43f9792 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /geoipupdate-2.2.1.tar.gz
 /geoipupdate-2.2.2.tar.gz
 /geoipupdate-2.3.1.tar.gz
+/geoipupdate-2.4.0.tar.gz
diff --git a/.rpmlint b/.rpmlint
new file mode 100644
index 0000000..54539bf
--- /dev/null
+++ b/.rpmlint
@@ -0,0 +1,12 @@
+from Config import *
+
+# Documentation for cron packages is the package %description
+addFilter("no-documentation")
+
+# Cron scripts can be edited by end users
+addFilter("executable-marked-as-config-file /etc/cron.weekly/geoipupdate")
+
+# Technical term
+addFilter("spelling-error Summary\(en_US\) Cron -> ")
+addFilter("spelling-error %description -l en_US Cron -> ")
+
diff --git a/geoipupdate.spec b/geoipupdate.spec
index 2ae72b1..b780501 100644
--- a/geoipupdate.spec
+++ b/geoipupdate.spec
@@ -1,22 +1,17 @@
-# Noarch subpackages available from Fedora 10, RHEL6
-%global noarch_subpkgs 0%{?fedora} > 9 || 0%{?rhel} > 5
-
 %global _hardened_build 1
 
 Name:		geoipupdate
-Version:	2.3.1
-Release:	2%{?dist}
+Version:	2.4.0
+Release:	1%{?dist}
 Summary:	Update GeoIP2 and GeoIP Legacy binary databases from MaxMind
-Group:		Development/Tools
 License:	GPLv2
 URL:		http://dev.maxmind.com/geoip/geoipupdate/
 Source0:	http://github.com/maxmind/geoipupdate/releases/download/v%{version}/geoipupdate-%{version}.tar.gz
 Source1:	geoipupdate.cron
 Source2:	geoipupdate6.cron
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	coreutils
-BuildRequires:	curl-devel
 BuildRequires:	gcc
+BuildRequires:	libcurl-devel
 BuildRequires:	make
 BuildRequires:	zlib-devel
 # Perl modules used by IPv6 cron script
@@ -33,10 +28,7 @@ Legacy binary databases.
 
 %package cron
 Summary:	Cron job to do weekly updates of GeoIP databases
-Group:		Development/Tools
-%if %{noarch_subpkgs}
 BuildArch:	noarch
-%endif
 Requires:	%{name} = %{version}-%{release}
 Requires:	crontabs
 Obsoletes:	GeoIP-update < 1.6.0
@@ -47,10 +39,7 @@ Cron job for weekly updates to GeoIP Legacy database from MaxMind.
 
 %package cron6
 Summary:	Cron job to do weekly updates of GeoIP IPv6 databases
-Group:		Development/Tools
-%if %{noarch_subpkgs}
 BuildArch:	noarch
-%endif
 Requires:	%{name} = %{version}-%{release}
 Requires:	crontabs
 Requires:	wget
@@ -68,7 +57,6 @@ Cron job for weekly updates to GeoIP IPv6 Legacy database from MaxMind.
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 # We'll package the documentation ourselves
@@ -87,9 +75,6 @@ mkdir -p %{buildroot}%{_datadir}/GeoIP/download/
 : > %{buildroot}%{_datadir}/GeoIP/download/GeoLiteCityv6.dat.gz
 : > %{buildroot}%{_datadir}/GeoIP/download/GeoIPASNumv6.dat.gz
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %if 0%{?_licensedir:1}
 %license LICENSE
@@ -114,6 +99,28 @@ rm -rf %{buildroot}
 %ghost %{_datadir}/GeoIP/download/GeoIPASNumv6.dat.gz
 
 %changelog
+* Fri May 26 2017 Paul Howarth <paul@city-fan.org> - 2.4.0-1
+- Update to 2.4.0
+  - geoipupdate now checks that the database directory is writable: if it is
+    not, it reports the problem and aborts
+  - geoipupdate now acquires a lock when starting up to ensure only one
+    instance may run at a time: a new option, 'LockFile', exists to set the
+    file to use as a lock ('.geoipupdate.lock' in the database directory by
+    default)
+  - geoipupdate now prints out additional information from the server when a
+    download request results in something other than HTTP status 2xx; this
+    provides more information when the API does not respond with a database
+    file
+  - ${datarootdir}/GeoIP is now created on 'make install' (GH#29)
+  - Previously, a variable named 'ERROR' was used, which caused issues building
+    on Windows (GH#36)
+- Drop EL-5 support
+  - Drop BuildRoot: and Group: tags
+  - Drop explicit buildroot cleaning in %%install section
+  - Drop explicit %%clean section
+  - noarch subpackages always available now
+  - libcurl-devel always available now
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/sources b/sources
index 68dffd2..a3bf414 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (geoipupdate-2.3.1.tar.gz) = 98537e17ea03dbc0e377bf3fd045a96cbcf2f36f1fbcdf494f0a60d15f9ea5d2f0cd5e127245c6425e0ff8b77028147a2a6316034752298c8e9671007b7245a1
+SHA512 (geoipupdate-2.4.0.tar.gz) = 6285810380a12ce34c90798fe31954959c9b462060e9b49348b5dbca3af7f3b1798384cf958de3b213ac7d03d42688c6744365d91efc4ad1fe76330bd893d4b1