diff --git a/Makefile.am b/Makefile.am
index 77a1fe306..b6ed9c783 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,11 +24,29 @@ logdir = @prefix@/var/log
 install-data-hook:
 	test -d ${DESTDIR}${logdir} || mkdir -p ${DESTDIR}${logdir}
 
-mrproper:
-	rm -f include/rb/config.h
-	rm -f include/rb/config.h.in
-
-clean-local:
-	rm -f ircd/ircd_lexer.c
-	rm -f ircd/ircd_parser.c
-	rm -f ircd/ircd_parser.h
+mrproper-local:
+	rm -f aclocal.m4
+	rm -rf autom4te.cache
+	rm -f compile
+	rm -f config.*
+	rm -f configure
+	rm -f depcomp
+	rm -f ltmain.sh
+	rm -f install-sh
+	rm -rf libltdl
+	rm -f libtool
+	rm -f missing
+	rm -f ylwrap
+	rm -f */Makefile
+	rm -f */Makefile.in
+	rm -rf */.deps
+	rm -f Makefile
+	rm -f Makefile.in
+	rm -f m4/argz.m4
+	rm -f m4/libtool.m4
+	rm -f m4/ltargz.m4
+	rm -f m4/ltdl.m4
+	rm -f m4/ltoptions.m4
+	rm -f m4/ltsugar.m4
+	rm -f m4/ltversion.m4
+	rm -f m4/lt~obsolete.m4
diff --git a/authd/Makefile.am b/authd/Makefile.am
index f291f5df8..cd66d96e2 100644
--- a/authd/Makefile.am
+++ b/authd/Makefile.am
@@ -18,3 +18,7 @@ authd_SOURCES =	\
 	providers/opm.c
 
 authd_LDADD = $(top_srcdir)/rb/librb.la
+
+mrproper-local:
+	rm -rf providers/.deps
+	rm -f providers/.dirstamp
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 21f60cf8b..d43b8a1f7 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -33,4 +33,3 @@ install: install-mkdirs
 	-@if test -f $(DESTDIR)$(sysconfdir)/links.txt; then \
 		$(RM) $(DESTDIR)$(sysconfdir)/links.txt; \
 	fi
-
diff --git a/modules/Makefile.am b/modules/Makefile.am
index d7e20ac7f..dd152e4cc 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -94,3 +94,8 @@ module_LTLIBRARIES = \
   core/m_quit.la \
   core/m_server.la \
   core/m_squit.la
+
+
+mrproper-local:
+	rm -rf core/.deps
+	rm -f core/.dirstamp
diff --git a/rb/Makefile.am b/rb/Makefile.am
index 899dd9f5a..e5b7b39a1 100644
--- a/rb/Makefile.am
+++ b/rb/Makefile.am
@@ -38,3 +38,9 @@ librb_la_SOURCES =			\
 librb_la_LDFLAGS = @SSL_LIBS@ @GNUTLS_LIBS@ @MBEDTLS_LIBS@ -avoid-version -no-undefined -export-symbols export-syms.txt
 librb_la_LIBADD = @SSL_LIBS@ @GNUTLS_LIBS@ @MBEDTLS_LIBS@
 lib_LTLIBRARIES = librb.la
+
+
+mrproper-local:
+	rm -f $(top_srcdir)/include/rb/config.h
+	rm -f $(top_srcdir)/include/rb/config.h.in
+	rm -f $(top_srcdir)/include/rb/stamp-h1
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 274de4e09..b93debdab 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -7,3 +7,7 @@ charybdis_mkpasswd_LDADD = $(top_srcdir)/rb/librb.la
 
 charybdis_mkfingerprint_SOURCES = mkfingerprint.c
 charybdis_mkfingerprint_LDADD = $(top_srcdir)/rb/librb.la
+
+
+mrproper-local:
+	rm -f genssl