diff --git a/Makefile.am b/Makefile.am
index e3b009ed..27105ec0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,6 @@ SUBDIRS = src tools
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
-EXTRA_DIST = LICENSE VERSION README.md Doxyfile doc/html
+EXTRA_DIST = LICENSE VERSION README.md Doxyfile doc
 
 @DX_RULES@
diff --git a/src/samples/Makefile.am b/src/samples/Makefile.am
index 2d0fcc3f..38cb84cd 100644
--- a/src/samples/Makefile.am
+++ b/src/samples/Makefile.am
@@ -84,10 +84,11 @@ SAMPLES = \
 	wlan \
 	exceptions
 
-all:
+# FIXME: This workaround is actually needed to get the stage1 installation
+# without samples working. Once a better way to do header installation for
+# newlib is figured out, this can be rewritten.
 
-dist-hook:
-	rm -rf `find $(distdir) -name .svn -o -name CVS`
+all:
 
 # Install all of the samples.  Rename any files that end in a .sample extension.
 SAMPLES_INSTALL = $(INSTALL_DATA)
diff --git a/src/startup/Makefile.am b/src/startup/Makefile.am
index 4c815bfd..2766dd10 100644
--- a/src/startup/Makefile.am
+++ b/src/startup/Makefile.am
@@ -8,14 +8,22 @@ CPPFLAGS = -I$(top_srcdir)/src/base -I$(top_srcdir)/src/kernel -I$(top_srcdir)/s
 CFLAGS = @PSPSDK_CFLAGS@
 CCASFLAGS = $(CFLAGS)
 
-## Borrow this trick from newlib - create a dummy library to generate build rules.
+# Borrowed this trick from newlib: create a dummy library to generate build rules.
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = dummy.c
 
+# FIXME: This workaround is actually needed to get the stage1 installation
+# working. Once a better way to do crt0 installation for newlib is figured out,
+# this can be rewritten.
+
 all: crt0.o crt0_prx.o prxexports.o
 
 startupdir = @PSPDEV_LIBDIR@
-pspsdkdir     = @PSPSDK_LIBDIR@
+pspsdkdir = @PSPSDK_LIBDIR@
+
+# Overwrite build rule to disable dependency magic
+.c.o:
+	$(AM_V_CC)$(COMPILE) $< -c -o $@
 
 # Install the prx specific stuff in the pspsdk libdir
 install-exec-hook:
@@ -24,7 +32,6 @@ install-exec-hook:
 	$(INSTALL_DATA) crt0_prx.o $(DESTDIR)$(startupdir)/crt0_prx.o
 	$(INSTALL_DATA) prxexports.o $(DESTDIR)$(pspsdkdir)/prxexports.o
 
-
 uninstall-hook:
 	rm -f $(DESTDIR)$(startupdir)/crt0.o
 	rm -f $(DESTDIR)$(startupdir)/crt0_prx.o
@@ -32,5 +39,5 @@ uninstall-hook:
 
 CLEANFILES = crt0.o crt0_prx.o prxexports.o 
 
-## How else do I add a dependency for this?
+# Explicitly add dependencies
 EXTRA_DIST = crt0.c crt0_prx.c prxexports.c