diff --git a/.gitignore b/.gitignore
index cfccb41..21b508b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+v*.tar.gz
 imapfilter-2.0.11.tar.bz2
 /imapfilter-2.5.tar.gz
 /imapfilter-makefile-fix-v2.5.5.patch
diff --git a/imapfilter-makefile-fix-v2.5.6.patch b/imapfilter-makefile-fix-v2.5.6.patch
deleted file mode 100644
index 5f26cdc..0000000
--- a/imapfilter-makefile-fix-v2.5.6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 297b8c60803db84248c10e1eceed1d45e9226a97 Mon Sep 17 00:00:00 2001
-From: David Sommerseth <davids@redhat.com>
-Date: Tue, 2 Jul 2013 20:19:19 +0200
-Subject: [PATCH] Tweaks to src/Makefile to fit Fedora requirements
-
-Signed-off-by: David Sommerseth <davids@redhat.com>
----
- src/Makefile |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index c1ec9d0..9e05544 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,8 +1,8 @@
- DESTDIR =
--PREFIX = /usr/local
-+PREFIX = /usr
- BINDIR = $(PREFIX)/bin
- SHAREDIR = $(PREFIX)/share/imapfilter
--MANDIR = $(PREFIX)/man
-+MANDIR = $(PREFIX)/share/man
- 
- MYCFLAGS =
- MYLDFLAGS =
-@@ -16,7 +16,7 @@ LIBPCRE = -lpcre
- LIBSSL = -lssl
- LIBCRYPTO = -lcrypto
- 
--CFLAGS = -Wall -Wextra -O -DCONFIG_SHAREDIR='"$(SHAREDIR)"' $(INCDIRS) $(MYCFLAGS)
-+CFLAGS += -Wall -Wextra -DCONFIG_SHAREDIR='"$(SHAREDIR)"' $(INCDIRS)
- LDFLAGS = $(LIBDIRS) $(MYLDFLAGS)
- LIBS = -lm $(LIBLUA) $(LIBPCRE) $(LIBSSL) $(LIBCRYPTO) $(MYLIBS)
- 
--- 
-1.7.10.2
-
diff --git a/imapfilter-makefile-fix.patch b/imapfilter-makefile-fix.patch
new file mode 100644
index 0000000..1650426
--- /dev/null
+++ b/imapfilter-makefile-fix.patch
@@ -0,0 +1,30 @@
+From 297b8c60803db84248c10e1eceed1d45e9226a97 Mon Sep 17 00:00:00 2001
+From: David Sommerseth <davids@redhat.com>
+Date: Tue, 2 Jul 2013 20:19:19 +0200
+Subject: [PATCH] Tweaks to src/Makefile to fit Fedora requirements
+
+Signed-off-by: David Sommerseth <davids@redhat.com>
+---
+ src/Makefile |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -2,7 +2,7 @@ DESTDIR ?=
+ PREFIX ?= /usr/local
+ BINDIR = $(PREFIX)/bin
+ SHAREDIR = $(PREFIX)/share/imapfilter
+-MANDIR = $(PREFIX)/man
++MANDIR = $(PREFIX)/share/man
+ 
+ MYCFLAGS =
+ MYLDFLAGS =
+@@ -16,7 +16,7 @@ LIBPCRE = -lpcre
+ LIBSSL = -lssl
+ LIBCRYPTO = -lcrypto
+ 
+-CFLAGS = -Wall -Wextra -O -DCONFIG_SHAREDIR='"$(SHAREDIR)"' $(INCDIRS) $(MYCFLAGS)
++CFLAGS += -Wall -Wextra -DCONFIG_SHAREDIR='"$(SHAREDIR)"' $(INCDIRS)
+ LDFLAGS = $(LIBDIRS) $(MYLDFLAGS)
+ LIBS = -lm -ldl $(LIBLUA) $(LIBPCRE) $(LIBSSL) $(LIBCRYPTO) $(MYLIBS)
+ 
diff --git a/imapfilter.spec b/imapfilter.spec
index 1e2c58c..33b93b8 100644
--- a/imapfilter.spec
+++ b/imapfilter.spec
@@ -1,17 +1,13 @@
 Name:           imapfilter
-Version:        2.5.6
-Release:        8%{?dist}
+Version:        2.6.10
+Release:        2%{?dist}
 Summary:        A flexible client side mail filtering utility for IMAP servers
 
 Group:          Applications/Internet
 License:        MIT
 URL:            https://github.com/lefcha/imapfilter/
-# Thanks to githubs new regime, we're not given any extention on the download - but it is a tar.gz file.
-# Source URL https://codeload.github.com/lefcha/imapfilter/tar.gz/v%{version}
-# Download it and save it as imapfilter-%{version}.tar.gz
-# And yeah, rpmlint will complain.
-Source0:        imapfilter-%{version}.tar.gz
-Patch0:         imapfilter-makefile-fix-v2.5.6.patch
+Source0:        https://github.com/lefcha/imapfilter/archive/v%{version}.tar.gz
+Patch0:         imapfilter-makefile-fix.patch
 
 BuildRequires:  openssl-devel lua-devel pcre-devel
 
@@ -25,17 +21,16 @@ protocol are supported.
 
 
 %prep
-%setup -q -n imapfilter-%{version}
-%patch0 -p1
+%autosetup -p1 -n imapfilter-%{version}
 
 %build
 # imapfilter does not have any autotools based ./configure - just a plain Makefile
-CFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags}
+CFLAGS=$RPM_OPT_FLAGS make PREFIX=%{_prefix} %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT
 
 
 %files
@@ -47,6 +42,12 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 03 2017 Matěj Cepl <mcepl@redhat.com> - 2.6.10-2
+- add PREFIX to %%build make as well
+
+* Thu Aug 03 2017 Matěj Cepl <mcepl@redhat.com> - 2.6.10-1
+- Update to the latest upstream release.
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.6-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index b2e088f..cfc0f8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9a7bd220201ba3f388208810e1c53349  imapfilter-2.5.6.tar.gz
+SHA512 (v2.6.10.tar.gz) = b01f50d22583b5c89e446c70ab4dea711ca5a2c77fad5362799bc137f48083fbf9c6fc403648502c963f0da14ea8edf652c98ed9ffac96db27b8408aec21014a