diff --git a/MANIFEST.in.galaxy b/MANIFEST.in.galaxy
new file mode 100644
index 00000000000..c749475c802
--- /dev/null
+++ b/MANIFEST.in.galaxy
@@ -0,0 +1,3 @@
+recursive-include lib/galaxy/web/framework/templates *.mako
+recursive-include lib/galaxy/web/framework/static *
+recursive-include lib/galaxy/tools/bundled *
diff --git a/Makefile b/Makefile
index cea7c06f367..1450e595e6d 100644
--- a/Makefile
+++ b/Makefile
@@ -80,6 +80,23 @@ clean-grunt-docker-image: ## Remove grunt docker image
 	docker rmi ${GRUNT_DOCKER_NAME}
 
 
+wheels: wheel-galaxy-lib wheel-galaxy-app wheel-galaxy
+
+wheel-galaxy-lib:
+	rm -rf build MANIFEST.in
+	GALAXY_PACKAGE=galaxy-lib python setup.py bdist_wheel
+
+wheel-galaxy-app:
+	rm -rf build MANIFEST.in
+	GALAXY_PACKAGE=galaxy-app python setup.py bdist_wheel
+
+# FIXME: it'd be great if client time could be compared against the wheel and
+# not rebuild client if unnecessary. But it's really only a problem in dev.
+# When this stuff goes into production it won't be as big of a deal.
+wheel-galaxy: client
+	ln -s MANIFEST.in.galaxy MANIFEST.in
+	GALAXY_PACKAGE=galaxy python setup.py bdist_wheel
+
 # Release Targets
 release-create-rc: release-ensure-upstream ## Create a release-candidate branch
 	git checkout dev
diff --git a/setup.py b/setup.py
index f6dfe52ec56..1ab4f3f41be 100644
--- a/setup.py
+++ b/setup.py
@@ -35,6 +35,7 @@ if GALAXY_PACKAGE == "galaxy-lib":
     package_data = [
         'exceptions/error_codes.json',
         'datatypes/converters/*.xml',
+        'datatypes/display_applications/configs/*/*.xml',
         'datatypes/set_metadata_tool.xml',
         'tools/imp_exp/imp_history_from_archive.xml',
         'tools/imp_exp/exp_history_to_archive.xml',