diff --git a/euscanwww/djeuscan/tests/test_views.py b/euscanwww/djeuscan/tests/test_views.py
index be4e59e..4139453 100644
--- a/euscanwww/djeuscan/tests/test_views.py
+++ b/euscanwww/djeuscan/tests/test_views.py
@@ -1,6 +1,9 @@
 import StringIO
 
-from BeautifulSoup import BeautifulSoup
+try:
+    from BeautifulSoup import BeautifulSoup
+except ImportError:
+    from bs4 import BeautifulSoup
 
 from djeuscan.tests import SystemTestCase
 from djeuscan.tests.euscan_factory import PackageFactory, setup_maintainers, \
diff --git a/pym/euscan/handlers/generic.py b/pym/euscan/handlers/generic.py
index 5cf9d49..92c2984 100644
--- a/pym/euscan/handlers/generic.py
+++ b/pym/euscan/handlers/generic.py
@@ -2,7 +2,10 @@ import urllib2
 import re
 import StringIO
 
-from BeautifulSoup import BeautifulSoup
+try:
+    from BeautifulSoup import BeautifulSoup
+except ImportError:
+    from bs4 import BeautifulSoup
 
 import portage