diff --git a/HISTORY.rst b/HISTORY.rst
index e317844..769ba64 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -87,6 +87,7 @@ History
 - Added `IMAX` as new `edition` possible value.
 - Added `Upscaled` as new `other` possible value.
 - Added `Ultimate` as new `edition` possible value.
+- Added `Fan` as new `edition` possible value.
 
 2.1.4 (2017-06-01)
 ------------------
diff --git a/docs/properties.rst b/docs/properties.rst
index 87ce77f..fb4d9f4 100644
--- a/docs/properties.rst
+++ b/docs/properties.rst
@@ -266,8 +266,8 @@ Other properties
   Edition of the movie.
 
   - ``Alternative Cut``, ``Collector``, ``Criterion``, ``Deluxe``, ``Director's Cut``, ``Director's Definitive Cut``,
-    ``Extended``, ``Festival``, ``IMAX``, ``Remastered``, ``Special``, ``Limited``, ``Theatrical``, ``Ultimate``,
-    ``Uncensored``, ``Uncut``, ``Unrated``
+    ``Extended``, ``Fan``, ``Festival``, ``IMAX``, ``Remastered``, ``Special``, ``Limited``, ``Theatrical``,
+    ``Ultimate``, ``Uncensored``, ``Uncut``, ``Unrated``
 
 
 - **film**
diff --git a/guessit/rules/properties/edition.py b/guessit/rules/properties/edition.py
index f3cd8ab..d5905c6 100644
--- a/guessit/rules/properties/edition.py
+++ b/guessit/rules/properties/edition.py
@@ -39,7 +39,9 @@ def edition():
         rebulk.string(value, value=value, tags=['has-neighbor', 'release-group-prefix'])
     rebulk.string('Festival', value='Festival', tags=['has-neighbor-before', 'has-neighbor-after'])
     rebulk.regex('imax', 'imax-edition', value='IMAX')
+    rebulk.regex('fan-edit(?:ion)?', 'fan-collection', value='Fan')
     rebulk.regex('ultimate-edition', value='Ultimate')
     rebulk.regex("ultimate-collector'?s?-edition", value=['Ultimate', 'Collector'])
+    rebulk.regex('ultimate-fan-edit(?:ion)?', 'ultimate-fan-collection', value=['Ultimate', 'Fan'])
 
     return rebulk
diff --git a/guessit/test/movies.yml b/guessit/test/movies.yml
index 5327952..989025e 100644
--- a/guessit/test/movies.yml
+++ b/guessit/test/movies.yml
@@ -1342,3 +1342,8 @@
   audio_codec: Dolby Digital
   release_group: DaDDy
   type: movie
+
+? Stargate SG1 Ultimate Fan Collection
+: title: Stargate SG1
+  edition: [Ultimate, Fan]
+  type: movie
diff --git a/guessit/test/rules/edition.yml b/guessit/test/rules/edition.yml
index 3ca942b..4b7fd98 100644
--- a/guessit/test/rules/edition.yml
+++ b/guessit/test/rules/edition.yml
@@ -38,16 +38,26 @@
 ? IMAX Edition
 : edition: IMAX
 
-? ULTIMATE EDITION
-? -ULTIMATE
+? ultimate edition
+? -ultimate
 : edition: Ultimate
 
-? ULTIMATE COLLECTOR EDITION
-? ULTIMATE COLLECTOR'S EDITION
-? ULTIMATE COLLECTORS EDITION
-? -COLLECTORS EDITION
-? -ULTIMATE EDITION
+? ultimate collector edition
+? ultimate collector's edition
+? ultimate collectors edition
+? -collectors edition
+? -ultimate edition
 : edition: [Ultimate, Collector]
 
-? ULTIMATE COLLECTORS EDITION DC
+? ultimate collectors edition dc
 : edition: [Ultimate, Collector, Director's Cut]
+
+? fan edit
+? fan edition
+? fan collection
+: edition: Fan
+
+? ultimate fan edit
+? ultimate fan edition
+? ultimate fan collection
+: edition: [Ultimate, Fan]