Index: debian/remove.nonfree
===================================================================
--- debian/remove.nonfree	(revision 3)
+++ debian/remove.nonfree	(working copy)
@@ -1,5 +1,8 @@
 #! /bin/sh
 
+ORG_NAME="Gnuzilla"
+ORG_DOMAIN="gnuzilla.gnu.org"
+
 rm -fv ./build/wince/shunt/build/shunt.vcb
 rm -fv ./build/wince/shunt/build/shunt.vco
 #rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch \(2i\).68k.u
@@ -146,3 +149,12 @@
 
 rm -fv netwerk/protocol/ftp/doc/rfc959.txt
 rm -fv directory/c-sdk/ldap/docs/draft-ietf-ldapext-ldap-c-api-05.txt
+
+# sunbird stuff
+
+rm -fv calendar/sunbird/app/sunbird.ico
+rm -fv calendar/sunbird/app/default.xpm
+
+cat calendar/sunbird/app/brand.dtd.in | sed -e "s/Sunbird/Calendar/g" |  sed -e "s/Mozilla/$ORG_NAME/g" | sed -e "s/www.mozilla.org.*\"/$ORG_DOMAIN\"/g" > calendar/sunbird/app/brand.dtd.in.new; mv calendar/sunbird/app/brand.dtd.in.new calendar/sunbird/app/brand.dtd.in
+
+cat calendar/sunbird/app/brand.properties | sed -e "s/Sunbird/Calendar/g" | sed -e "s/Mozilla/$ORG_NAME/g" > calendar/sunbird/app/brand.properties.new; mv calendar/sunbird/app/brand.properties.new calendar/sunbird/app/brand.properties