diff --git a/embedding/components/ui/helperAppDlg/MANIFEST b/embedding/components/ui/helperAppDlg/MANIFEST
new file mode 100644
index 000000000000..53a19ca7d4d7
--- /dev/null
+++ b/embedding/components/ui/helperAppDlg/MANIFEST
@@ -0,0 +1 @@
+nsHelperAppDlg.js
diff --git a/embedding/components/ui/helperAppDlg/Makefile.in b/embedding/components/ui/helperAppDlg/Makefile.in
index 4f3bc0ad9e18..89d947394348 100644
--- a/embedding/components/ui/helperAppDlg/Makefile.in
+++ b/embedding/components/ui/helperAppDlg/Makefile.in
@@ -27,14 +27,14 @@ MODULE=helperAppDlg
 include $(DEPTH)/config/autoconf.mk
 
 XPIDLSRCS = \
-	.\nsIHelperAppLauncherDialog.idl \
+	./nsIHelperAppLauncherDialog.idl \
 	$(NULL)
 
 JSCOMPONENTS = \
-	.\nsHelperAppDlg.js \
+	./nsHelperAppDlg.js \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 install:: $(JSCOMPONENTS)
-	!@$(MAKE_INSTALL) $(JSCOMPONENTS) $(DIST)\bin\components
+	$(INSTALL) $(JSCOMPONENTS) $(DIST)/bin/components
diff --git a/embedding/components/ui/helperAppDlg/locale/en-US/nsHelperAppDlg.properties b/embedding/components/ui/helperAppDlg/locale/en-US/nsHelperAppDlg.properties
new file mode 100644
index 000000000000..e2d42450a1a2
--- /dev/null
+++ b/embedding/components/ui/helperAppDlg/locale/en-US/nsHelperAppDlg.properties
@@ -0,0 +1 @@
+saveDialogTitle=Enter name of file to save to...
diff --git a/embedding/components/ui/helperAppDlg/nsHelperAppDlg.js b/embedding/components/ui/helperAppDlg/nsHelperAppDlg.js
index e280a729f6f1..e11b8250369a 100644
--- a/embedding/components/ui/helperAppDlg/nsHelperAppDlg.js
+++ b/embedding/components/ui/helperAppDlg/nsHelperAppDlg.js
@@ -48,7 +48,7 @@ function nsHelperAppDialog() {
 
 nsHelperAppDialog.prototype = {
     // Turn this on to get debugging messages.
-    debug: true,
+    debug: false,
 
     // Dump text (if debug is on).
     dump: function( text ) {
@@ -99,7 +99,6 @@ nsHelperAppDialog.prototype = {
                            .createBundle( "chrome://global/locale/helperAppLauncher.properties");
 
         var windowTitle = bundle.GetStringFromName( "saveDialogTitle" );
-
         
         var parent = aContext
                         .QueryInterface( Components.interfaces.nsIInterfaceRequestor )
@@ -284,9 +283,9 @@ nsHelperAppDialog.prototype = {
                     if ( !app.exists() ) {
                         // Show alert and try again.
                         var msg = this.replaceInsert( this.getString( "badApp" ), 1, app.unicodePath );
-                        var dlgs = Components.classes[ "@mozilla.org/appshell/commonDialogs;1" ]
-                                      .getService( Components.interfaces.nsICommonDialogs );
-                        dlgs.Alert( this.mDialog, this.getString( "badApp.title" ), msg );
+                        var svc = Components.classes[ "@mozilla.org/embedcomp/prompt-service;1" ]
+                                      .getService( Components.interfaces.nsIPromptService );
+                        svc.alert( this.mDialog, this.getString( "badApp.title" ), msg );
                         // Disable the OK button.
                         this.dialogElement( "ok" ).disabled = true;
                         // Leave dialog up.