diff --git a/INSTALL b/INSTALL
index ec95e2cd..0965f161 100644
--- a/INSTALL
+++ b/INSTALL
@@ -79,8 +79,7 @@ As Postfix currently does not provide the milter library, you need to have
 sendmail sources or development package installed.  See
 http://www.postfix.org/MILTER_README.html
 
-You can view the configuration options with the following command (once you
-have built the configure script (see step 3, below)):
+You can view the configuration options with the following command:
 
 	./configure --help
 
@@ -89,16 +88,18 @@ installed.
 
 Steps to compiling the library and the milter:
 
-(1) Download the source from github
-    git clone https://github.com/trusteddomainproject/OpenDMARC.git
+(1) Download the source from SourceForge
+    (http://sourceforge.net/projects/opendmarc).
 
-(2) Change directories to the repository directory that
+(2) Unpack the tarball:
+	tar -xzvf opendmarc-<version>.tar.gz
+
+    Note: Use <version> as the version number that you downloaded.
+
+(3) Change directories to the release directory (opendmarc-<version>) that
     was created in step 2.
 	cd opendmarc-<version>
 
-(3) Run gnu autoreconf to generate the configure and make files.
-	autoreconf -v -i
-
 (4) Run the "configure" script to configure the package for your operating
     system.
 	./configure
diff --git a/configure.ac b/configure.ac
index 5d1a7ad0..1155dbf7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -523,6 +523,7 @@ AC_OUTPUT([ Makefile
 	contrib/spec/Makefile
 		contrib/spec/opendmarc.spec
 	db/Makefile
+	docs/Makefile
 	libopendmarc/Makefile
 	libopendmarc/tests/Makefile
 	libopendmarc/tests/testfiles/Makefile
diff --git a/contrib/spec/opendmarc.spec.in b/contrib/spec/opendmarc.spec.in
index 49371632..4051c82e 100644
--- a/contrib/spec/opendmarc.spec.in
+++ b/contrib/spec/opendmarc.spec.in
@@ -121,7 +121,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc INSTALL README RELEASE_NOTES
+%doc INSTALL README RELEASE_NOTES docs/draft-dmarc-base-02.txt
 %doc db/README.schema db/schema.mysql
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
diff --git a/libopendmarc/dmarc.h b/libopendmarc/dmarc.h
index f7fd07da..9a888010 100644
--- a/libopendmarc/dmarc.h
+++ b/libopendmarc/dmarc.h
@@ -150,7 +150,7 @@ OPENDMARC_STATUS_T opendmarc_get_policy_token_used(DMARC_POLICY_T *pctx);
  * TLD processing
  */
 int  		   opendmarc_tld_read_file(char *path_fname, char *commentstring, char *drop, char *except);
-void		   opendmarc_tld_shutdown(void);
+void		   opendmarc_tld_shutdown();
 
 /*
  * XML Parsing
diff --git a/libopendmarc/opendmarc_policy.c b/libopendmarc/opendmarc_policy.c
index c994a27d..be14f6c3 100644
--- a/libopendmarc/opendmarc_policy.c
+++ b/libopendmarc/opendmarc_policy.c
@@ -632,7 +632,7 @@ opendmarc_policy_query_dmarc_xdomain(DMARC_POLICY_T *pctx, u_char *uri)
 			continue;
 		}
 	}
-	if (dns_reply == NETDB_SUCCESS && strcmp( buf, "&" ) != 0)
+	if (dns_reply == NETDB_SUCCESS && buf != NULL)
 	{
 		/* Must include DMARC version */
 		if (strncasecmp((char *)buf, "v=DMARC1", sizeof buf) == 0)
@@ -661,7 +661,7 @@ opendmarc_policy_query_dmarc_xdomain(DMARC_POLICY_T *pctx, u_char *uri)
 			continue;
 		}
 	}
-	if (dns_reply == NETDB_SUCCESS && strcmp( buf, "&" ) != 0)
+	if (dns_reply == NETDB_SUCCESS && buf != NULL)
 	{
 		/* Must include DMARC version */
 		if (strncasecmp((char *)buf, "v=DMARC1", sizeof buf) == 0)
diff --git a/libopendmarc/opendmarc_spf.c b/libopendmarc/opendmarc_spf.c
index 7b48fb40..567896da 100644
--- a/libopendmarc/opendmarc_spf.c
+++ b/libopendmarc/opendmarc_spf.c
@@ -1098,9 +1098,10 @@ opendmarc_spf_macro_expand(SPF_CTX_T *spfctx, char *str, char *buf, size_t bufle
 		{
 			num = strtoul(xp, &xp, 10);
 		}
-		char * cp;
 		switch ((int)*sp)
 		{
+		    char * cp;
+
 		    case 's':
 			if (rev == TRUE)
 				(void) opendmarc_spf_reverse(spfctx->mailfrom_domain, scratch, MAXDNSHOSTNAME);
diff --git a/libopendmarc/opendmarc_strl.c b/libopendmarc/opendmarc_strl.c
index 0c59b002..fedb24cc 100644
--- a/libopendmarc/opendmarc_strl.c
+++ b/libopendmarc/opendmarc_strl.c
@@ -50,7 +50,10 @@
 */
 
 size_t
-dmarc_strlcpy(register char *dst, register const char *src, ssize_t size)
+dmarc_strlcpy(dst, src, size)
+	register char *dst;
+	register const char *src;
+	ssize_t size;
 {
 	register ssize_t i;
 
@@ -93,7 +96,10 @@ dmarc_strlcpy(register char *dst, register const char *src, ssize_t size)
 */
 
 size_t
-dmarc_strlcat(register char *dst, register const char *src, ssize_t size)
+dmarc_strlcat(dst, src, size)
+	register char *dst;
+	register const char *src;
+	ssize_t size;
 {
 	register ssize_t i, j, o;
 
diff --git a/libopendmarc/opendmarc_tld.c b/libopendmarc/opendmarc_tld.c
index ae8e13a6..8ac45e88 100644
--- a/libopendmarc/opendmarc_tld.c
+++ b/libopendmarc/opendmarc_tld.c
@@ -110,7 +110,7 @@ opendmarc_tld_read_file(char *path_fname, char *commentstring, char *drop, char
 	u_char 	buf[BUFSIZ];
 	char *	cp;
 	void *	vp;
-	int	nlines=0;
+	int	nlines;
 	int	ret;
 	u_char	revbuf[MAXDNSHOSTNAME];
 	int	adddot;
diff --git a/opendmarc/opendmarc.c b/opendmarc/opendmarc.c
index bacf8199..a3dcd7c1 100644
--- a/opendmarc/opendmarc.c
+++ b/opendmarc/opendmarc.c
@@ -2451,7 +2451,7 @@ mlfi_eom(SMFICTX *ctx)
 	strncpy(dfc->mctx_fromdomain, domain, sizeof dfc->mctx_fromdomain - 1);
 
 	ostatus = opendmarc_policy_store_from_domain(cc->cctx_dmarc,
-	                                             dfc->mctx_fromdomain);
+	                                             from->hdr_value);
 	if (ostatus != DMARC_PARSE_OKAY)
 	{
 		if (conf->conf_dolog)