diff --git a/xpinstall/Makefile.in b/xpinstall/Makefile.in
index 2cf1bade8b1..8a8749ae2da 100644
--- a/xpinstall/Makefile.in
+++ b/xpinstall/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "License"); you may not use this file except in
@@ -22,19 +21,16 @@
 #     Daniel Veditz <dveditz@netscape.com>
 #     Douglas Turner <dougt@netscape.com>
 #     Samir Gehani <sgehani@netscape.com>
+#
 
-
-DEPTH = ..
+DEPTH		= ..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = public res src notifier
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public res src notifier
 
 include $(topsrcdir)/config/rules.mk
 
-
diff --git a/xpinstall/src/Makefile.in b/xpinstall/src/Makefile.in
index 12649582935..05c8245e006 100644
--- a/xpinstall/src/Makefile.in
+++ b/xpinstall/src/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "License"); you may not use this file except in
@@ -21,54 +20,51 @@
 # Contributors:
 #     Daniel Veditz <dveditz@netscape.com>
 #     Douglas Turner <dougt@netscape.com>
+#
 
-DEPTH           = ../..
-topsrcdir       = @top_srcdir@
-VPATH           = @srcdir@
-srcdir          = @srcdir@
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+VPATH		= @srcdir@
+srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= nsxpi
 LIBRARY_NAME	= nsxpi
 IS_COMPONENT	= 1
-REQUIRES        = dom js netlib raptor xpcom
+REQUIRES	= dom js netlib raptor xpcom
 
 # XXX shouldn't need to export this
-EXPORTS         = nsXPITriggerInfo.h \
-                  $(NULL)
+EXPORTS		= nsXPITriggerInfo.h
 
-CPPSRCS = \
-    nsInstall.cpp               \
-    nsInstallTrigger.cpp        \
-    nsInstallVersion.cpp        \
-    nsInstallFolder.cpp         \
-    nsJSInstall.cpp             \
-    nsJSInstallTriggerGlobal.cpp\
-    nsJSInstallVersion.cpp      \
-    nsSoftwareUpdate.cpp        \
-    nsSoftwareUpdateRun.cpp     \
-    nsInstallFile.cpp           \
-    nsInstallDelete.cpp         \
-    nsInstallExecute.cpp        \
-    nsInstallPatch.cpp          \
-    nsInstallUninstall.cpp      \
-    nsInstallResources.cpp      \
-    nsTopProgressNotifier.cpp   \
-    nsLoggingProgressNotifier.cpp   \
-    ScheduledTasks.cpp          \
-    nsInstallProgressDialog.cpp	\
-    nsXPITriggerInfo.cpp        \
-    nsXPInstallManager.cpp      \
-    nsInstallFileOpItem.cpp     \
-    $(NULL)
+CPPSRCS		= \
+		nsInstall.cpp \
+		nsInstallTrigger.cpp \
+		nsInstallVersion.cpp \
+		nsInstallFolder.cpp \
+		nsJSInstall.cpp \
+		nsJSInstallTriggerGlobal.cpp \
+		nsJSInstallVersion.cpp \
+		nsSoftwareUpdate.cpp \
+		nsSoftwareUpdateRun.cpp \
+		nsInstallFile.cpp \
+		nsInstallDelete.cpp \
+		nsInstallExecute.cpp \
+		nsInstallPatch.cpp \
+		nsInstallUninstall.cpp \
+		nsInstallResources.cpp \
+		nsTopProgressNotifier.cpp \
+		nsLoggingProgressNotifier.cpp \
+		ScheduledTasks.cpp \
+		nsInstallProgressDialog.cpp \
+		nsXPITriggerInfo.cpp \
+		nsXPInstallManager.cpp \
+		nsInstallFileOpItem.cpp \
+		$(NULL)
 
-LOCAL_INCLUDES += -I$(srcdir)/../public
+LOCAL_INCLUDES	= -I$(srcdir)/../public
 
-EXTRA_DSO_LDOPTS = \
-                   -L$(DIST)/lib \
-                   $(ZLIB_LIBS) \
-                   -lneckoutil_s
+EXTRA_DSO_LDOPTS = -L$(DIST)/lib $(ZLIB_LIBS) -lneckoutil_s
 
 include $(topsrcdir)/config/rules.mk