diff --git a/mozilla/camino/Camino.xcode/project.pbxproj b/mozilla/camino/Camino.xcode/project.pbxproj
index c7f87037b6d..6384688c62a 100644
--- a/mozilla/camino/Camino.xcode/project.pbxproj
+++ b/mozilla/camino/Camino.xcode/project.pbxproj
@@ -17211,7 +17211,7 @@
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.javascript;
 			name = "all-camino.js";
-			path = "resources/application/all-camino.js";
+			path = "generated/all-camino.js";
 			refType = 2;
 			sourceTree = SOURCE_ROOT;
 		};
diff --git a/mozilla/camino/Makefile.in b/mozilla/camino/Makefile.in
index 97d878bbe41..de8de0bacd5 100644
--- a/mozilla/camino/Makefile.in
+++ b/mozilla/camino/Makefile.in
@@ -20,6 +20,8 @@
 #
 # Contributor(s):
 #  Brian Ryner <bryner@brianryner.com>
+#  Mark Mentovai <mark@moxienet.com>
+#  Smokey Ardisson <alqahira@ardisson.org>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -49,6 +51,9 @@ DIRS = \
 
 APP_NAME	= Camino
 
+FOX_APP_VERSION_FILE = $(srcdir)/../browser/config/version.txt
+FOX_APP_VERSION = $(shell cat $(FOX_APP_VERSION_FILE))
+
 ifdef MOZ_DEBUG
 BUILDSTYLE	= Development
 else
@@ -82,10 +87,18 @@ endif
 clean clobber repackage::
 	rm -rf $(DIST)/$(APP_NAME).app
 	rm -rf embed-replacements.tmp
+	rm -rf generated
+
+generated:
+	mkdir -p $@
+
+# Generate files which need to pull version numbers from elsewhere in the tree
+generated/all-camino.js: $(srcdir)/resources/application/all-camino.js.in $(FOX_APP_VERSION_FILE) generated
+	sed -e "s/@FOX_APP_VERSION@/$(FOX_APP_VERSION)/" $< > $@
 
 # The embed-replacements rsync is done for both srcdir and objdir builds
 # to avoid adding CVS stuff to embed.jar.
-libs::
+libs:: generated/all-camino.js
 	rsync -aC --delete $(srcdir)/embed-replacements/ embed-replacements.tmp
 	cd embed-replacements.tmp && $(ZIP) -r0DX ../../dist/Embed/chrome/embed.jar *
 	$(PBBUILD) -project Camino.xcode -target $(TARGET) -buildstyle $(BUILDSTYLE) $(PBBUILD_SETTINGS)
diff --git a/mozilla/camino/resources/application/all-camino.js b/mozilla/camino/resources/application/all-camino.js.in
similarity index 97%
rename from mozilla/camino/resources/application/all-camino.js
rename to mozilla/camino/resources/application/all-camino.js.in
index 152e29d19ee..e1efcdce3e4 100644
--- a/mozilla/camino/resources/application/all-camino.js
+++ b/mozilla/camino/resources/application/all-camino.js.in
@@ -66,6 +66,9 @@ pref("chimera.log_js_to_console", false);
 pref("general.useragent.vendor", "Camino");
 pref("general.useragent.vendorSub", "2.0a1pre");
 
+// work around stupid sites sniffing for firefox instead of gecko
+pref("general.useragent.extra.notfox", "(like Firefox/@FOX_APP_VERSION@)");
+
 pref("browser.chrome.favicons", true);
 pref("browser.urlbar.autocomplete.enabled", true);