diff --git a/cfg.mk b/cfg.mk
index f98c94be6467f409015dd67abc24cc6008dc1cc2..d24386264f1f2d6048d0c56bbad1b5b8da4fab88 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -584,6 +584,9 @@ sc_copyright_format:
 	@prohibit='Copyright [^(].*Red 'Hat				\
 	halt='consistently use (C) in Red Hat copyright'		\
 	  $(_sc_search_regexp)
+	@prohibit='\<Red''Hat\>'					\
+	halt='spell Red Hat as two words'				\
+	  $(_sc_search_regexp)
 
 # Some functions/macros produce messages intended solely for developers
 # and maintainers.  Do not mark them for translation.
diff --git a/src/util/files.c b/src/util/files.c
index de4ae87569eca1dbd05db6569bdfc17d7f9f4fc0..bef56b68cd5941de1385652ccbe84212013c9e6d 100644
--- a/src/util/files.c
+++ b/src/util/files.c
@@ -1,9 +1,9 @@
 /*
- * memory.c: safer file handling
+ * files.c: safer file handling
  *
+ * Copyright (C) 2010-2011 Red Hat, Inc.
  * Copyright (C) 2010 IBM Corporation
  * Copyright (C) 2010 Stefan Berger
- * Copyright (C) 2010 RedHat, Inc.
  * Copyright (C) 2010 Eric Blake
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/util/files.h b/src/util/files.h
index 5137fb34e928b4508761956d168cc652a0311170..8b681eb2addc4ee6d6ad311a3ab32f435168e183 100644
--- a/src/util/files.h
+++ b/src/util/files.h
@@ -1,7 +1,7 @@
 /*
  * files.h: safer file handling
  *
- * Copyright (C) 2010-2011 RedHat, Inc.
+ * Copyright (C) 2010-2011 Red Hat, Inc.
  * Copyright (C) 2010 IBM Corporation
  * Copyright (C) 2010 Stefan Berger
  * Copyright (C) 2010 Eric Blake