diff --git a/calendar/confvars.sh b/calendar/confvars.sh
index e70a7f2657..73d1249cf2 100755
--- a/calendar/confvars.sh
+++ b/calendar/confvars.sh
@@ -37,7 +37,9 @@
 # ***** END LICENSE BLOCK *****
 
 MOZ_APP_NAME=sunbird
-MOZ_APP_DISPLAYNAME=Calendar
+# This sets the default for nightly branding, and may get overriden by options
+# in configure.in depending on the arguments passed.
+MOZ_BRANDING_DIRECTORY=$MOZ_BUILD_APP/sunbird/branding/nightly
 MOZ_UPDATER=1
 MOZ_SUNBIRD=1
 MOZ_CALENDAR=1
diff --git a/calendar/sunbird/branding/nightly/configure.sh b/calendar/sunbird/branding/nightly/configure.sh
new file mode 100644
index 0000000000..ed1d7469b4
--- /dev/null
+++ b/calendar/sunbird/branding/nightly/configure.sh
@@ -0,0 +1 @@
+MOZ_APP_DISPLAYNAME=Calendar
diff --git a/configure.in b/configure.in
index c3573d0ef4..83e188c92d 100644
--- a/configure.in
+++ b/configure.in
@@ -4923,7 +4923,6 @@ MOZ_ARG_ENABLE_BOOL(official-branding,
 [case "$MOZ_BUILD_APP" in
 calendar)
     MOZ_BRANDING_DIRECTORY=other-licenses/branding/sunbird
-    MOZ_APP_DISPLAYNAME=Sunbird
     ;;
 
 mail)
diff --git a/other-licenses/branding/sunbird/configure.sh b/other-licenses/branding/sunbird/configure.sh
new file mode 100644
index 0000000000..9c42f8bc9b
--- /dev/null
+++ b/other-licenses/branding/sunbird/configure.sh
@@ -0,0 +1 @@
+MOZ_APP_DISPLAYNAME=Sunbird