diff --git a/lib/py/Makefile.am b/lib/py/Makefile.am
index 7d47430..796f99e 100644
--- a/lib/py/Makefile.am
+++ b/lib/py/Makefile.am
@@ -1,4 +1,8 @@
 DESTDIR ?= /
+EXTRA_DIST = bootstrap.sh cleanup.sh setup.py LICENSE src
+
+all:
+	$(PYTHON) setup.py build
 
 # We're ignoring prefix here because site-packages seems to be
 # the equivalent of /usr/local/lib in Python land.
@@ -7,4 +11,6 @@
 install-exec-hook:
 	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PY_PREFIX) $(PYTHON_SETUPUTIL_ARGS)
 
-EXTRA_DIST = bootstrap.sh cleanup.sh setup.py LICENSE src
+clean-generic:
+	rm -rf build
+
diff --git a/lib/py/src/server/TServer.py b/lib/py/src/server/TServer.py
index 2a8d5f4..74bb93e 100644
--- a/lib/py/src/server/TServer.py
+++ b/lib/py/src/server/TServer.py
@@ -90,6 +90,8 @@
         client = self.serverTransport.accept()
         t = threading.Thread(target = self.handle, args=(client,))
         t.start()
+      except KeyboardInterrupt:
+        raise
       except Exception, x:
         print '%s, %s, %s,' % (type(x), x, traceback.format_exc())