diff --git a/Changes b/Changes
index 3844fb03e..67b14f57d 100644
--- a/Changes
+++ b/Changes
@@ -2676,3 +2676,7 @@ seen. gmtime warning still there
 - Added a ./curlinstall script to help with installing curl (Read INSTALL.REMOTEINC for
   more information).
 - Added code to make remote includes able to use SSL (HTTPS/FTPS) if SSL support is enabled
+- Fixed a remote include bug with rehashing when no remote includes were loaded
+- Fixed a remote include compile bug on Linux regarding url.h
+- Fixed a remote include compile bug regarding ares (#0001458) reported by mustapha88
+- Made the tmp/ directory cleaned up better
diff --git a/autoconf/aclocal.m4 b/autoconf/aclocal.m4
index 0d93e26b7..ce4db4dfa 100644
--- a/autoconf/aclocal.m4
+++ b/autoconf/aclocal.m4
@@ -57,7 +57,7 @@ AC_DEFUN(CHECK_LIBCURL,
 
 		dnl curl-7.11.0 and up will include the ares info, older versions do not
 		if test "x`echo $CURLLIBS |grep .*ares.*`" = x ; then
-			CURLLIBS="$CURLLIBS -L$enableval/ares -lares"
+			CURLLIBS="$CURLLIBS -lares"
 		fi
 		IRCDLIBS="$IRCDLIBS $CURLLIBS"
 		URL="url.o"
diff --git a/configure b/configure
index 7f69be0af..aaf331912 100755
--- a/configure
+++ b/configure
@@ -9597,7 +9597,7 @@ if test "${enable_libcurl+set}" = set; then
 		CURLLIBS=`$enableval/bin/curl-config --libs`
 
 				if test "x`echo $CURLLIBS |grep .*ares.*`" = x ; then
-			CURLLIBS="$CURLLIBS -L$enableval/ares -lares"
+			CURLLIBS="$CURLLIBS -lares"
 		fi
 		IRCDLIBS="$IRCDLIBS $CURLLIBS"
 		URL="url.o"
diff --git a/curlinstall b/curlinstall
index 5a11406cc..abbae0097 100755
--- a/curlinstall
+++ b/curlinstall
@@ -45,6 +45,8 @@ CPPFLAGS="-I$HOME/ares/include" ./configure --prefix=$HOME/curl --disable-shared
 cp -R $HOME/ares/lib ares
 make && make install
 
+cp $HOME/ares/lib/libares.a $HOME/curl/lib
+
 cd $save_PWD
 
 echo ""
diff --git a/src/Makefile b/src/Makefile
index d7eaa5f71..eacacb999 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -250,7 +250,7 @@ extcmodes.o: extcmodes.c $(INCLUDES)
 extbans.o: extbans.c $(INCLUDES)
 	$(CC) $(CFLAGS) -c extbans.c
 
-url.o: url.c $(INCLUDES) include/url.h
+url.o: url.c $(INCLUDES) ../include/url.h
 	$(CC) $(CFLAGS) -c url.c
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/modules.c b/src/modules.c
index 7210955f8..5188c595c 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -97,12 +97,9 @@ void DeleteTempModules(void)
 
 	while ((dir = readdir(fd)))
 	{
-		if (!match("*.so", dir->d_name))
-		{
-			strcpy(tempbuf, "tmp/");
-			strcat(tempbuf, dir->d_name);
-			remove(tempbuf);
-		}
+		strcpy(tempbuf, "tmp/");
+		strcat(tempbuf, dir->d_name);
+		remove(tempbuf);
 	}
 	closedir(fd);
 #endif
diff --git a/src/s_conf.c b/src/s_conf.c
index 9e525d7d5..18d059861 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -6978,6 +6978,7 @@ int     rehash(aClient *cptr, aClient *sptr, int sig)
 {
 #ifdef USE_LIBCURL
 	ConfigItem_include *inc;
+	char found_remote = 0;
 	if (loop.ircd_rehashing)
 	{
 		if (!sig)
@@ -6997,10 +6998,13 @@ int     rehash(aClient *cptr, aClient *sptr, int sig)
 			continue;
 		if (inc->flag.type & INCLUDE_NOTLOADED)
 			continue;
+		found_remote = 1;
 		stat(inc->file, &sb);
 		download_file_async(inc->url, sb.st_ctime, conf_download_complete);
 		inc->flag.type |= INCLUDE_DLQUEUED;
 	}
+	if (!found_remote)
+		return rehash_internal(cptr, sptr, sig);
 	return 0;
 #else
 	return rehash_internal(cptr, sptr, sig);