diff --git a/immutabase/cli.py b/immutabase/cli.py
index 8b9c53c1..fda822e9 100644
--- a/immutabase/cli.py
+++ b/immutabase/cli.py
@@ -21,8 +21,13 @@ def build(files):
 @click.option('-h', '--host', default='0.0.0.0')
 @click.option('-p', '--port', default=8001)
 @click.option('--debug', is_flag=True)
-def serve(files, host, port, debug):
+@click.option('--reload', is_flag=True)
+def serve(files, host, port, debug, reload):
     """Serve up specified database files with a web UI"""
+    if reload:
+        import hupper
+        hupper.start_reloader('immutabase.cli.serve')
+
     click.echo('Serve! files={} on port {}'.format(files, port))
     app = app_factory(files)
     app.run(host=host, port=port, debug=debug)
diff --git a/setup.py b/setup.py
index 62c91d63..5e1b037f 100644
--- a/setup.py
+++ b/setup.py
@@ -11,6 +11,7 @@ setup(
         'click-default-group==1.2',
         'sanic==0.6.0',
         'sanic-jinja2==0.5.5',
+        'hupper==1.0',
     ],
     entry_points='''
         [console_scripts]