diff --git a/devel/ccache/Makefile b/devel/ccache/Makefile
index 1b952d975ab..3a51e5b15fe 100644
--- a/devel/ccache/Makefile
+++ b/devel/ccache/Makefile
@@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.47 2019/01/16 10:29:40 sthen Exp $
+# $OpenBSD: Makefile,v 1.48 2019/04/24 21:04:46 sthen Exp $
 
 COMMENT =	compiler cache
 
-DISTNAME =	ccache-3.6
+V =		3.7
+DISTNAME =	ccache-$V
 CATEGORIES =	devel
 
-HOMEPAGE =	https://ccache.samba.org/
+HOMEPAGE =	https://ccache.dev/
 
 MAINTAINER =	Stuart Henderson <sthen@openbsd.org>
 
@@ -14,11 +15,11 @@ PERMIT_PACKAGE_CDROM =	 Yes
 
 WANTLIB += c m z
 
-MASTER_SITES =	https://www.samba.org/ftp/ccache/
+MASTER_SITES =	https://github.com/ccache/ccache/releases/download/v$V/
 
 CONFIGURE_STYLE =	gnu
 
-# This port should not have dependencies.
+# This port should not have build/run dependencies.
 NO_CCACHE =		Yes
 
 TEST_DEPENDS =		shells/bash \
diff --git a/devel/ccache/distinfo b/devel/ccache/distinfo
index 0adc2a6e13a..434ea84f082 100644
--- a/devel/ccache/distinfo
+++ b/devel/ccache/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ccache-3.6.tar.gz) = o/K5GiNTtlqGPFkBJR7+SAYOzevsRrXq7I6o4JK56HE=
-SIZE (ccache-3.6.tar.gz) = 485536
+SHA256 (ccache-3.7.tar.gz) = +jVYp14TuQAOyTFAKV0Rm4B184vAzpKLb6pbNOkdPjA=
+SIZE (ccache-3.7.tar.gz) = 497724
diff --git a/devel/ccache/patches/patch-Makefile_in b/devel/ccache/patches/patch-Makefile_in
index dbac62b7ab6..768b49f5e7a 100644
--- a/devel/ccache/patches/patch-Makefile_in
+++ b/devel/ccache/patches/patch-Makefile_in
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile_in,v 1.3 2019/01/04 16:26:55 sthen Exp $
+$OpenBSD: patch-Makefile_in,v 1.4 2019/04/24 21:04:47 sthen Exp $
 
 remove $< gmake'ism - this port needs to have no dependencies (for USE_CCACHE)
 
@@ -9,7 +9,7 @@ get rid of warning spam during build,
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -103,19 +103,15 @@ files_to_distclean = Makefile config.h config.log conf
+@@ -106,19 +106,15 @@ files_to_distclean = Makefile config.h config.log conf
  all: ccache$(EXEEXT)
  
  ccache$(EXEEXT): $(ccache_objs) $(extra_libs)
@@ -30,7 +30,7 @@ Index: Makefile.in
  @disable_man@	$(Q)$(installcmd) -d $(DESTDIR)$(mandir)/man1
  @disable_man@	$(Q)-$(installcmd) -m 644 ccache.1 $(DESTDIR)$(mandir)/man1/
  
-@@ -123,7 +119,6 @@ install: ccache$(EXEEXT) @disable_man@ccache.1
+@@ -126,7 +122,6 @@ install: ccache$(EXEEXT) @disable_man@ccache.1
  clean:
  	rm -rf $(files_to_clean)
  
@@ -38,7 +38,7 @@ Index: Makefile.in
  $(zlib_objs): CPPFLAGS += -include config.h
  $(zlib_objs): CFLAGS += @no_implicit_fallthrough_warning@
  
-@@ -172,7 +167,6 @@ installcheck: ccache$(EXEEXT) unittest/run$(EXEEXT)
+@@ -175,7 +170,6 @@ installcheck: ccache$(EXEEXT) unittest/run$(EXEEXT)
  	CCACHE=$(bindir)/ccache CC='$(CC)' $(BASH) $(srcdir)/test/run
  
  .c.o:
diff --git a/devel/ccache/patches/patch-configure b/devel/ccache/patches/patch-configure
index 1702e8ec0f5..7571dea2da5 100644
--- a/devel/ccache/patches/patch-configure
+++ b/devel/ccache/patches/patch-configure
@@ -1,9 +1,11 @@
-$OpenBSD: patch-configure,v 1.6 2019/01/16 10:29:40 sthen Exp $
+$OpenBSD: patch-configure,v 1.7 2019/04/24 21:04:47 sthen Exp $
+
+avoid nested functions in configure test (gcc extension)
 
 Index: configure
 --- configure.orig
 +++ configure
-@@ -4746,10 +4746,11 @@ else
+@@ -4762,10 +4762,11 @@ else
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <stdlib.h>