diff --git a/claws-mail/.footprint b/claws-mail/.footprint
index 6ea26bf1a..d44103575 100644
--- a/claws-mail/.footprint
+++ b/claws-mail/.footprint
@@ -99,12 +99,14 @@ drwxr-xr-x	root/root	usr/include/claws-mail/gtk/
 -rw-r--r--	root/root	usr/include/claws-mail/gtk/description_window.h
 -rw-r--r--	root/root	usr/include/claws-mail/gtk/filesel.h
 -rw-r--r--	root/root	usr/include/claws-mail/gtk/foldersort.h
+-rw-r--r--	root/root	usr/include/claws-mail/gtk/gdkkeysyms-new.h
 -rw-r--r--	root/root	usr/include/claws-mail/gtk/gtkaspell.h
 -rw-r--r--	root/root	usr/include/claws-mail/gtk/gtkcmclist.h
 -rw-r--r--	root/root	usr/include/claws-mail/gtk/gtkcmctree.h
 -rw-r--r--	root/root	usr/include/claws-mail/gtk/gtkcmoptionmenu.h
 -rw-r--r--	root/root	usr/include/claws-mail/gtk/gtksctree.h
 -rw-r--r--	root/root	usr/include/claws-mail/gtk/gtkshruler.h
+-rw-r--r--	root/root	usr/include/claws-mail/gtk/gtkunit.h
 -rw-r--r--	root/root	usr/include/claws-mail/gtk/gtkutils.h
 -rw-r--r--	root/root	usr/include/claws-mail/gtk/gtkvscrollbutton.h
 -rw-r--r--	root/root	usr/include/claws-mail/gtk/headers.h
diff --git a/claws-mail/.md5sum b/claws-mail/.md5sum
index ea82cb7e1..6a829c31b 100644
--- a/claws-mail/.md5sum
+++ b/claws-mail/.md5sum
@@ -1,2 +1 @@
-fcf58dcff52f0908ff3bc368d820408b  claws-mail-3.7.10.tar.bz2
-26b307a0ee6544c26e691baaa6b7b6bd  claws-mail-gnutls_v3.diff
+df9f1657d7f34959a2205344d952c2e3  claws-mail-3.8.0.tar.bz2
diff --git a/claws-mail/Pkgfile b/claws-mail/Pkgfile
index 3141c9f56..60ea71e03 100644
--- a/claws-mail/Pkgfile
+++ b/claws-mail/Pkgfile
@@ -7,14 +7,12 @@
 # Nice to have: enchant clamav dillo libgnomeprintui openldap
 
 name=claws-mail
-version=3.7.10
+version=3.8.0
 release=1
-source=(http://sourceforge.net/projects/sylpheed-claws/files/$name-$version.tar.bz2 \
-		$name-gnutls_v3.diff)
+source=(http://dl.sourceforge.net/project/sylpheed-claws/Claws%20Mail/$version/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
-	patch -p1 -i $SRC/$name-gnutls_v3.diff
 	./configure --prefix=/usr \
 				--disable-nls \
 				--disable-manual \
diff --git a/claws-mail/claws-mail-gnutls_v3.diff b/claws-mail/claws-mail-gnutls_v3.diff
deleted file mode 100644
index cad1fc594..000000000
--- a/claws-mail/claws-mail-gnutls_v3.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nru claws-mail-3.7.10-orig/src/common/ssl.c claws-mail-3.7.10/src/common/ssl.c
---- claws-mail-3.7.10-orig/src/common/ssl.c	2011-10-13 19:44:57.587829501 +0300
-+++ claws-mail-3.7.10/src/common/ssl.c	2011-10-13 19:46:21.876487515 +0300
-@@ -270,7 +270,9 @@
- 	if (session == NULL || r != 0)
- 		return FALSE;
-   
-+#if GNUTLS_VERSION_NUMBER < 0x030003
- 	gnutls_transport_set_lowat (session, 1); 
-+#endif
- 	gnutls_set_default_priority(session);
- 	gnutls_protocol_set_priority (session, proto_prio);
- 	gnutls_cipher_set_priority (session, cipher_prio);