diff --git a/setup.py b/setup.py
index cf1aebd..f13af70 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@
 import sys
 py_version = sys.version_info[:2]
 
-DEPENDENCIES = ['formencode>=1.3.0a1']
+DEPENDENCIES = ['formencode>=1.3.0a1', 'multipart']
 TESTS_DEPENDENCIES = ['sieve']
 
 if py_version == (3, 2):
diff --git a/sprox/sa/provider.py b/sprox/sa/provider.py
index 90e9897..ee225dc 100644
--- a/sprox/sa/provider.py
+++ b/sprox/sa/provider.py
@@ -33,7 +33,7 @@
 from sprox.sa.support import PropertyLoader, resolve_entity, Binary, LargeBinary, mapped_classes, mapped_class
 
 from sprox.iprovider import IProvider
-from cgi import FieldStorage
+from multipart import MultipartPart as FieldStorage
 from datetime import datetime, date, timedelta
 from warnings import warn
 
diff --git a/sprox/test/base.py b/sprox/test/base.py
index 4464a6c..0263333 100644
--- a/sprox/test/base.py
+++ b/sprox/test/base.py
@@ -5,7 +5,7 @@
 from sqlalchemy import *
 from sqlalchemy.orm import *
 from .model import *
-from cgi import FieldStorage
+from multipart import MultipartPart as FieldStorage
 from sprox._compat import unicode_text
 
 try:
diff --git a/tests/test_saormprovider.py b/tests/test_saormprovider.py
index ada5e2d..52deb91 100644
--- a/tests/test_saormprovider.py
+++ b/tests/test_saormprovider.py
@@ -12,7 +12,7 @@
 from nose.tools import raises, eq_
 import datetime
 
-from cgi import FieldStorage
+from multipart import MultipartPart as FieldStorage
 
 try:
     from io import BytesIO