diff --git a/ChangeLog b/ChangeLog
index 857ebb91..0d80846b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-09-06  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
+	* Makefile.am: Added a 'coverity' rule to assist with Coverity
+	submissions.
+
 	* tools/tiff2pdf.c: Fix compiler warning about unused function
 	when JPEG is not available.
 
diff --git a/Makefile.am b/Makefile.am
index c5fc74f4..418a3b93 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,3 +70,22 @@ release:
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libtiff-4.pc
+
+# Special rules to assist with Coverity submissions.
+PACKAGE_CHANGE_DATE=`awk '/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/ { print substr($$1,1,4) substr($$1,6,2) substr($$1,9,2); exit; }' $(top_srcdir)/ChangeLog`
+COVERITY_EMAIL=bfriesen@simple.dallas.tx.us
+COVERITY_TARBALL=libtiff.xz
+COVERITY_VERSION=devel-${PACKAGE_CHANGE_DATE}
+COVERITY_DESCRIPTION='libtiff development'
+coverity:
+	$(MAKE) clean
+	cov-build --dir cov-int $(MAKE)
+	tar caf $(COVERITY_TARBALL) cov-int
+	curl --limit-rate 50K \
+	--form token=`cat $$HOME/.coverity_key_tiff` \
+	--form email=$(COVERITY_EMAIL) \
+	--form file=@$(COVERITY_TARBALL) \
+	--form version=$(COVERITY_VERSION) \
+	--form description=$(COVERITY_DESCRIPTION) \
+	https://scan.coverity.com/builds?project=tiff
+	$(RM) $(COVERITY_TARBALL)
diff --git a/Makefile.in b/Makefile.in
index 9efcddaa..e988c65f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -438,6 +438,13 @@ dist_doc_DATA = $(docfiles)
 SUBDIRS = port libtiff tools build contrib test man html
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libtiff-4.pc
+
+# Special rules to assist with Coverity submissions.
+PACKAGE_CHANGE_DATE = `awk '/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/ { print substr($$1,1,4) substr($$1,6,2) substr($$1,9,2); exit; }' $(top_srcdir)/ChangeLog`
+COVERITY_EMAIL = bfriesen@simple.dallas.tx.us
+COVERITY_TARBALL = libtiff.xz
+COVERITY_VERSION = devel-${PACKAGE_CHANGE_DATE}
+COVERITY_DESCRIPTION = 'libtiff development'
 all: all-recursive
 
 .SUFFIXES:
@@ -969,6 +976,18 @@ release:
 	(rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE)
 	(rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION)
 	(rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h)
+coverity:
+	$(MAKE) clean
+	cov-build --dir cov-int $(MAKE)
+	tar caf $(COVERITY_TARBALL) cov-int
+	curl --limit-rate 50K \
+	--form token=`cat $$HOME/.coverity_key_tiff` \
+	--form email=$(COVERITY_EMAIL) \
+	--form file=@$(COVERITY_TARBALL) \
+	--form version=$(COVERITY_VERSION) \
+	--form description=$(COVERITY_DESCRIPTION) \
+	https://scan.coverity.com/builds?project=tiff
+	$(RM) $(COVERITY_TARBALL)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.