diff --git a/bin/win32/BINDInstall/AccountInfo.cpp b/bin/win32/BINDInstall/AccountInfo.cpp
index 678cd7686a..a6b063fdeb 100644
--- a/bin/win32/BINDInstall/AccountInfo.cpp
+++ b/bin/win32/BINDInstall/AccountInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2002, 2004, 2007, 2009, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2002, 2004, 2007, 2009, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index bb38a535aa..d35b050c03 100644
--- a/bin/win32/BINDInstall/BINDInstallDlg.cpp
+++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp
@@ -1167,7 +1167,7 @@ void CBINDInstallDlg::RegisterMessages() {
 		     (LPCTSTR)m_binDir, "bindevt.dll");
 	if (n < 0 || (size_t)n >= sizeof(pszMsgDLL))
 		throw(Exception(IDS_ERR_CREATE_KEY,
-			        "<m_binDir>\\bindevt.dll too long"));
+				"<m_binDir>\\bindevt.dll too long"));
 
 	SetCurrent(IDS_REGISTER_MESSAGES);
 	/* Create a new key for named */
diff --git a/bin/win32/BINDInstall/BINDInstallDlg.h b/bin/win32/BINDInstall/BINDInstallDlg.h
index 88c020e1a2..6dba6f514d 100644
--- a/bin/win32/BINDInstall/BINDInstallDlg.h
+++ b/bin/win32/BINDInstall/BINDInstallDlg.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2001, 2004, 2007, 2009, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2004, 2007, 2009, 2015-2017  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h
index f1fd5a634c..09eee8d59b 100644
--- a/lib/dns/include/dns/masterdump.h
+++ b/lib/dns/include/dns/masterdump.h
@@ -415,11 +415,11 @@ dns_master_stylecreate(dns_master_style_t **style,
 
 isc_result_t
 dns_master_stylecreate2(dns_master_style_t **style,
-		        dns_masterstyle_flags_t flags,
-		        unsigned int ttl_column, unsigned int class_column,
-		        unsigned int type_column, unsigned int rdata_column,
-		        unsigned int line_length, unsigned int tab_width,
-		        unsigned int split_width, isc_mem_t *mctx);
+			dns_masterstyle_flags_t flags,
+			unsigned int ttl_column, unsigned int class_column,
+			unsigned int type_column, unsigned int rdata_column,
+			unsigned int line_length, unsigned int tab_width,
+			unsigned int split_width, isc_mem_t *mctx);
 
 void
 dns_master_styledestroy(dns_master_style_t **style, isc_mem_t *mctx);
diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index 24d655dd8c..664ef6eed5 100644
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -2105,7 +2105,7 @@ dns_master_stylecreate(dns_master_style_t **stylep,
 
 isc_result_t
 dns_master_stylecreate2(dns_master_style_t **stylep,
-		        dns_masterstyle_flags_t flags,
+			dns_masterstyle_flags_t flags,
 			unsigned int ttl_column, unsigned int class_column,
 			unsigned int type_column, unsigned int rdata_column,
 			unsigned int line_length, unsigned int tab_width,