diff --git a/Allura/allura/ext/admin/admin_main.py b/Allura/allura/ext/admin/admin_main.py
index 6dff248..4d8847b 100644
--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -2,7 +2,7 @@
 import logging
 from pprint import pformat
 from collections import defaultdict
-import Image
+from PIL import Image
 from bson import ObjectId
 from datetime import datetime
 
diff --git a/Allura/allura/model/filesystem.py b/Allura/allura/model/filesystem.py
index 09684a7..f45a8df 100644
--- a/Allura/allura/model/filesystem.py
+++ b/Allura/allura/model/filesystem.py
@@ -2,7 +2,7 @@
 from cStringIO import StringIO
 
 import pylons
-import Image
+from PIL import Image
 from gridfs import GridFS
 
 from ming import schema
diff --git a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py
index a28ac1b..6fbcb3d 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -1,7 +1,8 @@
 import re
 import os, allura
 import pkg_resources
-import Image, StringIO
+from PIL import Image
+from cStringIO import StringIO
 from contextlib import contextmanager
 
 from nose.tools import assert_equals
diff --git a/Allura/allura/tests/functional/test_neighborhood.py b/Allura/allura/tests/functional/test_neighborhood.py
index 0389e1f..e8d4c12 100644
--- a/Allura/allura/tests/functional/test_neighborhood.py
+++ b/Allura/allura/tests/functional/test_neighborhood.py
@@ -3,7 +3,7 @@
 from cStringIO import StringIO
 from nose.tools import assert_raises
 
-import Image
+from PIL import Image
 from tg import config
 from nose.tools import assert_equal
 
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py
index eaa4e18..bccf2a0 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py
@@ -1,7 +1,7 @@
 import os
 import allura
-import Image
-from StringIO import StringIO
+from PIL import Image
+from cStringIO import StringIO
 import logging
 
 from alluratest.controller import TestController
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index a6c647e..23eb219 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import os
-import Image, StringIO
+from PIL import Image
+from cStringIO import StringIO
 import allura
 
 from mock import patch
diff --git a/ForgeWiki/forgewiki/tests/functional/test_root.py b/ForgeWiki/forgewiki/tests/functional/test_root.py
index 43dd786..1a178da 100644
--- a/ForgeWiki/forgewiki/tests/functional/test_root.py
+++ b/ForgeWiki/forgewiki/tests/functional/test_root.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import os
-import Image, StringIO
+from PIL import Image
+from cStringIO import StringIO
 import allura
 
 from nose.tools import assert_true
diff --git a/scripts/rethumb.py b/scripts/rethumb.py
index 90e1e67..3b7591a 100644
--- a/scripts/rethumb.py
+++ b/scripts/rethumb.py
@@ -2,7 +2,7 @@
 import time
 
 import pkg_resources
-import Image
+from PIL import Image
 import tg
 from pylons import c
 from paste.deploy.converters import asint