diff --git a/ChangeLog b/ChangeLog
index 76707cce7..d532e11b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
 	* Fix a bug that can occur when upgrading 1.1 config files
 	* #1517: Fix isohunt urls not loading
 	* Handle redirection when adding a torrent by url
+	* #1614: Fix autoadd matching a directory called "torrent"
 
 ==== GtkUI ====    
 	* #1514: Added Indicator Applet
diff --git a/deluge/core/autoadd.py b/deluge/core/autoadd.py
index 6d3d7a8bc..8d1219c9f 100644
--- a/deluge/core/autoadd.py
+++ b/deluge/core/autoadd.py
@@ -74,12 +74,12 @@ class AutoAdd(component.Component):
             return
 
         for filename in os.listdir(self.config["autoadd_location"]):
-            if filename.split(".")[-1] == "torrent":
-                try:
-                    filepath = os.path.join(self.config["autoadd_location"], filename)
-                except UnicodeDecodeError, e:
-                    log.error("Unable to auto add torrent due to inproper filename encoding: %s", e)
-                    continue
+            try:
+                filepath = os.path.join(self.config["autoadd_location"], filename)
+            except UnicodeDecodeError, e:
+                log.error("Unable to auto add torrent due to improper filename encoding: %s", e)
+                continue
+            if os.path.isfile(filepath) and filename.endswith(".torrent"):
                 try:
                     filedump = self.load_torrent(filepath)
                 except (RuntimeError, Exception), e:
diff --git a/setup.py b/setup.py
index 9d1285c70..65bed055b 100644
--- a/setup.py
+++ b/setup.py
@@ -67,6 +67,7 @@ _extra_compile_args = [
     "-D_FILE_OFFSET_BITS=64",
     "-DNDEBUG",
     "-DTORRENT_USE_OPENSSL=1",
+    "-DBOOST_FILESYSTEM_VERSION=2",
     "-O2",
     ]