diff --git a/conf.c b/conf.c
index 2f65efa..f05390c 100644
--- a/conf.c
+++ b/conf.c
@@ -171,7 +171,7 @@ conf_init(struct conf *c)
 	strlcpy(c->termpath, "xterm", sizeof(c->termpath));
 	strlcpy(c->lockpath, "xlock", sizeof(c->lockpath));
 
-	c->DefaultFontName = DEFAULTFONTNAME;
+	c->DefaultFontName = xstrdup(DEFAULTFONTNAME);
 }
 
 void
diff --git a/parse.y b/parse.y
index 98903e4..82ca689 100644
--- a/parse.y
+++ b/parse.y
@@ -100,11 +100,8 @@ yesno		: YES				{ $$ = 1; }
 		;
 
 main		: FONTNAME STRING		{
-			if (conf->DefaultFontName != NULL &&
-			    conf->DefaultFontName != DEFAULTFONTNAME)
-				free(conf->DefaultFontName);
-			conf->DefaultFontName = xstrdup($2);
-			free($2);
+			free(conf->DefaultFontName);
+			conf->DefaultFontName = $2;
 		}
 		| STICKY yesno {
 			if ($2 == 0)