diff --git a/ChangeLog b/ChangeLog
index 6b16c897b..c496367c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+	* finished non-seed torrents can also be in super-seeding mode
 	* fix issue related to unloading torrents
 	* fixed finished-time calculation
 	* add missing min_memory_usage() and high_performance_seed() settings presets to python
diff --git a/include/libtorrent/torrent.hpp b/include/libtorrent/torrent.hpp
index 045ffc1ee..9c9e33076 100644
--- a/include/libtorrent/torrent.hpp
+++ b/include/libtorrent/torrent.hpp
@@ -770,7 +770,7 @@ namespace libtorrent
 		bool super_seeding() const
 		{
 			// we're not super seeding if we're not a seed
-			return m_super_seeding && is_seed();
+			return m_super_seeding;
 		}
 
 		void super_seeding(bool on);