diff --git a/app/ext_xstatic.py b/app/ext_xstatic.py
deleted file mode 100644
index 96a2ce6..0000000
--- a/app/ext_xstatic.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""
-Glue between Flask and XStatic.
-"""
-
-from flask import send_from_directory
-from xstatic.main import XStatic
-
-
-class FlaskXStatic():
-    def __init__(self, app):
-        self.serve_files = {}
-
-        @app.route('/xstatic/<xs_package>/<path:filename>')
-        def xstatic(xs_package, filename):
-            base_dir = self.serve_files[xs_package]
-            return send_from_directory(base_dir, filename)
-
-    def add_module(self, module_name):
-        pkg = __import__('xstatic.pkg', fromlist=[module_name])
-        module = getattr(pkg, module_name)
-        xs = XStatic(module,
-                     root_url='/xstatic',
-                     provider='local',
-                     protocol='http',
-                     )
-        self.serve_files[xs.name] = xs.base_dir
-
-    def path_for(self, module_name):
-        return self.serve_files[module_name]
diff --git a/app/factory.py b/app/factory.py
index 80fe100..59dd0fd 100644
--- a/app/factory.py
+++ b/app/factory.py
@@ -11,6 +11,7 @@
 from flask.ext.login import current_user
 from flask.ext.migrate import Migrate
 from flask.ext.uploads import configure_uploads
+from flask.ext.xstatic import FlaskXStatic
 
 import models
 from annotation import annotation
@@ -19,7 +20,6 @@
 from auth import lm
 from comment import comment
 from document import document
-from ext_xstatic import FlaskXStatic
 from key import get_secret_key
 from uploads import documents
 from vendor.slack_log_handler import SlackLogHandler
diff --git a/requirements.txt b/requirements.txt
index c718830..4152bff 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,6 +11,7 @@ Flask-SQLAlchemy==2.0
 Flask-Testing==0.4.2
 Flask-Uploads==0.1.3
 Flask-WTF==0.10.3
+Flask-XStatic==0.0.1
 koremutake==1.0.5
 nose==1.3.4
 psycopg2==2.5.4
diff --git a/tests/test_xstatic.py b/tests/test_xstatic.py
deleted file mode 100644
index eedfceb..0000000
--- a/tests/test_xstatic.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from flask import url_for
-
-from common import RankoTestCase
-
-
-class XStaticTestCase(RankoTestCase):
-    def test_jquery(self):
-        url = url_for('xstatic', xs_package='jquery', filename='jquery.min.js')
-        r = self.client.get(url)
-        self.assert200(r)
-        self.assertIn('/*! jQuery v', r.data)