diff --git a/embedding/browser/activex/src/control/makefile.win b/embedding/browser/activex/src/control/makefile.win
index dd879b86628e..f235946f49e2 100644
--- a/embedding/browser/activex/src/control/makefile.win
+++ b/embedding/browser/activex/src/control/makefile.win
@@ -115,9 +115,9 @@ LCFLAGS = $(LCFLAGS) -DMOZ_ACTIVEX_CONTROL_SUPPORT -DHACK_AROUND_NONREENTRANT_IN
 PATH=$(DIST)\bin;$(PATH)
 
 install:: $(DLL)
-	$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
+	$(MAKE_INSTALL) $(DLL) $(DIST)\bin
 	$(MAKE_INSTALL) MozillaControl.html $(DIST)\bin\res
-	regsvr32 /s /c $(DIST)\bin\components\$(DLLNAME).dll
+	regsvr32 /s /c $(DIST)\bin\$(DLLNAME).dll
 
 clobber::
 	-regsvr32 /s /c /u $(DIST)\bin\$(DLLNAME).dll
diff --git a/xpinstall/packager/packages-win b/xpinstall/packager/packages-win
index 54e13f6fe4f0..35c6ab804399 100644
--- a/xpinstall/packager/packages-win
+++ b/xpinstall/packager/packages-win
@@ -35,6 +35,7 @@ bin\mozilla.exe
 bin\netscape.cfg
 bin\oji.dll
 bin\prstrms4.dll
+bin\mozctl.dll
 bin\components\AcctIdl.dll
 bin\components\AcctIdl.xpt
 bin\components\appshell.xpt
@@ -74,7 +75,6 @@ bin\components\mimetype.dll
 bin\components\mozbrwsr.dll
 bin\components\mozbrwsr.xpt
 bin\components\mozcomps.xpt
-bin\components\mozctl.dll
 bin\components\mozfind.dll
 bin\components\mozfind.xpt
 bin\components\mozucth.dll