diff --git a/CHANGES b/CHANGES
index ff1019d37..0065c6134 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,7 @@ Version 0.9
 
 (feature release, released on X)
 
+- Fix sorting of segment names to ignore NFS left over files. (#17)
 - Fix incorrect display of time (#13)
 - Improved error handling / reporting. (#12)
 - Use fcntl() instead of flock() when locking repository/cache. (#15)
diff --git a/LICENSE b/LICENSE
index e9ff9e548..2016c735c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2010-2013 Jonas Borgström <jonas@borgstrom.se>
+Copyright (C) 2010-2014 Jonas Borgström <jonas@borgstrom.se>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/attic/repository.py b/attic/repository.py
index f9e0c2deb..04920a6dd 100644
--- a/attic/repository.py
+++ b/attic/repository.py
@@ -296,7 +296,7 @@ def close(self):
     def _segment_names(self, reverse=False):
         for dirpath, dirs, filenames in os.walk(os.path.join(self.path, 'data')):
             dirs.sort(key=int, reverse=reverse)
-            filenames.sort(key=int, reverse=reverse)
+            filenames = sorted((filename for filename in filenames if filename.isdigit()), key=int, reverse=reverse)
             for filename in filenames:
                 yield int(filename), os.path.join(dirpath, filename)
 
diff --git a/docs/conf.py b/docs/conf.py
index 458746235..23a9a9615 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -41,7 +41,7 @@
 
 # General information about the project.
 project = 'Attic - Deduplicating Archiver'
-copyright = '2010-2013, Jonas Borgström'
+copyright = '2010-2014, Jonas Borgström'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the