diff --git a/config.py b/config.py
index 8b0f4b9ae..d9e6566b3 100644
--- a/config.py
+++ b/config.py
@@ -21,7 +21,7 @@ evemonMinVersion = "4081"
 
 # Database version (int ONLY)
 # Increment every time we need to flag for user database upgrade/modification
-dbversion = 6
+dbversion = 7
 
 pyfaPath = None
 savePath = None
diff --git a/eos/db/migrations/upgrade7.py b/eos/db/migrations/upgrade7.py
new file mode 100644
index 000000000..226f84b3a
--- /dev/null
+++ b/eos/db/migrations/upgrade7.py
@@ -0,0 +1,24 @@
+"""
+Migration 7
+
+- Converts Scorpion Ishukone Watch to Scorpion
+
+    Mosaic introduced proper skinning system, and Ishukone Scorp
+    was the only ship which was presented as stand-alone ship in
+    Pyfa.
+"""
+
+
+CONVERSIONS = {
+    640: (  # Scorpion
+        4005,  # Scorpion Ishukone Watch
+    )
+}
+
+def upgrade(saveddata_engine):
+
+    # Convert ships
+    for replacement_item, list in CONVERSIONS.iteritems():
+        for retired_item in list:
+            saveddata_engine.execute('UPDATE "fits" SET "shipID" = ? WHERE "shipID" = ?', (replacement_item, retired_item))
+
diff --git a/service/market.py b/service/market.py
index 2901e37ef..b4f3ef1b3 100644
--- a/service/market.py
+++ b/service/market.py
@@ -188,7 +188,6 @@ class Market():
             "Chremoas": self.les_grp, # AT11 prize :(
             "Moracha": self.les_grp, # AT11 prize
             "Stratios Emergency Responder": self.les_grp, # Issued for Somer Blink lottery
-            "Scorpion Ishukone Watch": self.les_grp, # Prize for offline events - fanfest PVP and poker tourneys
             "Miasmos Quafe Ultra Edition": self.les_grp, # Gift to people who purchased FF HD stream
             "InterBus Shuttle": self.les_grp,
             "Leopard": self.les_grp, # 2013 new year gift