diff --git a/Makefile.org b/Makefile.org
index fc1c90d2fa698d7619e536358a4ad766f9c51330..d9d6267a4afffe67ee1e8e66d1ca91767f622418 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -377,7 +377,7 @@ gentests:
 	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on generate );
 
 dclean:
-	rm -f *.bak
+	rm -rf *.bak include/openssl certs/.0
 	@set -e; target=dclean; $(RECURSIVE_BUILD_CMD)
 
 rehash: rehash.time
diff --git a/apps/Makefile b/apps/Makefile
index eca57d2a3c3e056cc84c3d72f9c987e9b6fd86a4..e9898fc56496a8226e49ae14b9897ee7938ddc32 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -137,6 +137,7 @@ depend:
 dclean:
 	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
 	mv -f Makefile.new $(MAKEFILE)
+	rm -f CA.pl
 
 clean:
 	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE)
diff --git a/crypto/Makefile b/crypto/Makefile
index b6e3f9424b63feb81c3ee121cd286c440bd34a7a..ef4f724f169869dbefd7723d14d381227ba0a85d 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -135,6 +135,7 @@ clean:
 dclean:
 	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
 	mv -f Makefile.new $(MAKEFILE)
+	rm -f opensslconf.h
 	@target=dclean; $(RECURSIVE_MAKE)
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c
index c5edaec4a031bdc2550335ea914198745798b85a..ceeda005f5a9fc8db2b9d1ed4609db4072472134 100644
--- a/crypto/dso/dso_dlfcn.c
+++ b/crypto/dso/dso_dlfcn.c
@@ -422,6 +422,7 @@ static int dladdr(void *address, Dl_info *dl)
 
 static int dlfcn_pathbyaddr(void *addr,char *path,int sz)
 	{
+#ifdef HAVE_DLINFO
 	Dl_info dli;
 	int len;
 
@@ -443,6 +444,7 @@ static int dlfcn_pathbyaddr(void *addr,char *path,int sz)
 		}
 
 	ERR_add_error_data(4, "dlfcn_pathbyaddr(): ", dlerror());
+#endif
 	return -1;
 	}
 
diff --git a/crypto/md4/Makefile b/crypto/md4/Makefile
index ef97bb0cbef082a3a31b84845e4c07ebdcbd1656..c94a1398ed0f019f3326fc80f9a66434ebbe6348 100644
--- a/crypto/md4/Makefile
+++ b/crypto/md4/Makefile
@@ -69,6 +69,7 @@ depend:
 dclean:
 	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
 	mv -f Makefile.new $(MAKEFILE)
+	rm -f ../../include/openssl/$(EXHEADER) ../../test/$(TEST) ../../apps/$(APPS)
 
 clean:
 	rm -f asm/mx86unix.cpp *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
diff --git a/test/Makefile b/test/Makefile
index 088d0bc12689bf613b63c84a516e66cb599014cf..398de38f996b51ee26dde37a9b37542be50e5fe8 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -306,9 +306,11 @@ depend:
 dclean:
 	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
 	mv -f Makefile.new $(MAKEFILE)
+	rm -f $(SRC) $(SHA256TEST).c $(SHA512TEST).c evptests.txt newkey.pem testkey.pem \
+			testreq.pem
 
 clean:
-	rm -f .rnd tmp.bntest tmp.bctest *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log
+	rm -f .rnd tmp.bntest tmp.bctest *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log dummytest
 
 $(DLIBSSL):
 	(cd ..; $(MAKE) DIRS=ssl all)
diff --git a/tools/Makefile b/tools/Makefile
index 4ca835c4af5cf8fd3e00b1e278d1926d8658276e..bb6fb71f3eb8a78173040442643383c09a51ac9b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -49,6 +49,7 @@ depend:
 dclean:
 	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
 	mv -f Makefile.new $(MAKEFILE)
+	rm -f c_rehash
 
 clean:
 	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff