diff --git a/Makefile b/Makefile
index 938f82161..85c8e16f9 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,8 @@ all: build/pyodide.asm.js \
 	build/dateutil.data \
 	build/pytz.data \
 	build/pandas.data \
-	build/matplotlib.data
+	build/matplotlib.data \
+	build/kiwisolver.data
 
 
 build/pyodide.asm.js: src/main.bc src/jsimport.bc src/jsproxy.bc src/js2python.bc \
@@ -178,12 +179,15 @@ build/matplotlib.data: $(MATPLOTLIB_LIBS)
 	python2 $(FILEPACKAGER) build/matplotlib.data --preload $(MATPLOTLIB_ROOT)@/lib/python3.6/site-packages/matplotlib --js-output=build/matplotlib.js --export-name=pyodide --exclude \*.wasm.pre --exclude __pycache__
 
 
+build/kiwisolver.data: $(KIWISOLVER_LIBS)
+	python2 $(FILEPACKAGER) build/kiwisolver.data --preload kiwisolver/build@/lib/python3.6/site-packages --js-output=build/kiwisolver.js --export-name=pyodide --exclude \*.wasm.pre --exclude __pycache__
+
+
 root/.built: \
 		$(CPYTHONLIB) \
 		$(SIX_LIBS) \
 		$(PYPARSING_LIBS) \
 		$(CYCLER_LIBS) \
-		$(KIWISOLVER_LIBS) \
 		src/sitecustomize.py \
 		src/webbrowser.py \
 		src/pyodide.py \
diff --git a/kiwisolver/Makefile b/kiwisolver/Makefile
index 0e39db4ba..41317143c 100644
--- a/kiwisolver/Makefile
+++ b/kiwisolver/Makefile
@@ -60,6 +60,7 @@ $(BUILD)/kiwisolver.so: \
 	[ -d $(ROOT)/build ] || mkdir $(ROOT)/build
 	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
 	mv $@.wasm $@
+	rm $@.wasm.pre
 
 
 $(ROOT)/.patched: $(HOSTDIR)/setup.py
diff --git a/src/pyodide.js b/src/pyodide.js
index f90ae8a4a..13142791a 100644
--- a/src/pyodide.js
+++ b/src/pyodide.js
@@ -12,7 +12,8 @@ var languagePluginLoader = new Promise((resolve, reject) => {
   // Package loading
   const packages = {
     'dateutil' : [],
-    'matplotlib' : [ 'numpy', 'dateutil', 'pytz' ],
+    'kiwisolver': [],
+    'matplotlib' : [ 'numpy', 'dateutil', 'pytz', 'kiwisolver' ],
     'numpy' : [],
     'pandas' : [ 'numpy', 'dateutil', 'pytz' ],
     'pytz' : [],