diff --git a/ChangeLog b/ChangeLog
index 2bc8f98b0..56bd45763 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-19  Riccardo Mottola <rm@gnu.org>
+
+	* Source/NSFontDescriptor.m
+	If we have no face set, don't append null
+
 2016-07-18 11:59-EDT Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Source/NSView.m: Move to new branch.
diff --git a/Source/NSFontDescriptor.m b/Source/NSFontDescriptor.m
index 93233d50a..a210506c7 100644
--- a/Source/NSFontDescriptor.m
+++ b/Source/NSFontDescriptor.m
@@ -2,7 +2,7 @@
 
    <abstract>The font descriptor class</abstract>
 
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 Free Software Foundation, Inc.
 
    Author: H. Nikolaus Schaller <hns@computer.org>
    Date: 2006
@@ -268,7 +268,7 @@
           withString: @""
           options: 0
           range: NSMakeRange(0, [family length])];
-  if ([face isEqualToString: @"Regular"])
+  if (!face || [face isEqualToString: @"Regular"])
     return family;
   return [NSString stringWithFormat: @"%@-%@", family, face];
 }