diff --git a/Makefile b/Makefile
index e19aae2..a66f76d 100644
--- a/Makefile
+++ b/Makefile
@@ -298,16 +298,6 @@ endif
 
 	install -D -m 0755 misc/qubes-desktop-run $(DESTDIR)$(BINDIR)/qubes-desktop-run
 
-	mkdir -p $(DESTDIR)/$(PYTHON_SITEARCH)/qubes/
-
-ifeq ($(shell lsb_release -is), Debian)
-	install -m 0644 misc/qubesxdg.py $(DESTDIR)/$(PYTHON2_SITELIB)/
-else ifeq ($(shell lsb_release -is), Ubuntu)
-	install -m 0644 misc/qubesxdg.py $(DESTDIR)/$(PYTHON2_SITELIB)/
-else
-	install -m 0644 misc/py2/qubesxdg.py* $(DESTDIR)/$(PYTHON2_SITELIB)/
-endif
-
 	install -d $(DESTDIR)/mnt/removable
 
 	install -D -m 0644 misc/xorg-preload-apps.conf $(DESTDIR)/etc/X11/xorg-preload-apps.conf
diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install
index 71ed3bc..de4d658 100644
--- a/debian/qubes-core-agent.install
+++ b/debian/qubes-core-agent.install
@@ -102,7 +102,6 @@ usr/bin/qvm-open-in-vm
 usr/bin/qvm-run-vm
 usr/bin/qvm-sync-clock
 usr/bin/xenstore-watch-qubes
-usr/lib/python2.7/dist-packages/qubesxdg.py
 usr/lib/python2.7/dist-packages/qubesagent-*.egg-info/*
 usr/lib/python2.7/dist-packages/qubesagent/*
 usr/lib/qubes-bind-dirs.d/30_cron.conf
diff --git a/misc/Makefile b/misc/Makefile
index 01533c3..5001802 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -23,7 +23,7 @@ python2:
 python3:
 	rm -rf py3
 	mkdir -p py3
-	cp dnf-qubes-hooks.py qubesxdg.py py3/
+	cp dnf-qubes-hooks.py py3/
 	python3 -m compileall py3
 	python3 -O -m compileall py3
 
diff --git a/misc/qubes-desktop-run b/misc/qubes-desktop-run
index e1116fb..89df349 100755
--- a/misc/qubes-desktop-run
+++ b/misc/qubes-desktop-run
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-from qubesxdg import launch
+from qubesagent.xdg import launch
 import sys
 
 if __name__ == '__main__':
diff --git a/misc/qubes-session-autostart b/misc/qubes-session-autostart
index e7bfe11..bad7541 100644
--- a/misc/qubes-session-autostart
+++ b/misc/qubes-session-autostart
@@ -25,7 +25,7 @@ import subprocess
 import sys
 
 from xdg.DesktopEntry import DesktopEntry
-from qubesxdg import launch
+from qubesagent.xdg import launch
 import xdg.BaseDirectory
 import os
 
diff --git a/misc/qubesxdg.py b/qubesagent/xdg.py
similarity index 100%
rename from misc/qubesxdg.py
rename to qubesagent/xdg.py
diff --git a/rpm_spec/core-agent.spec b/rpm_spec/core-agent.spec
index c97afe6..3607619 100644
--- a/rpm_spec/core-agent.spec
+++ b/rpm_spec/core-agent.spec
@@ -664,7 +664,6 @@ rm -f %{name}-%{version}
 /usr/lib/qubes/init/functions
 %dir /usr/lib/qubes-bind-dirs.d
 /usr/lib/qubes-bind-dirs.d/30_cron.conf
-/usr/lib/python2.7/site-packages/qubesxdg.py*
 /usr/share/qubes/serial.conf
 /usr/share/glib-2.0/schemas/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override
 /usr/share/glib-2.0/schemas/20_org.gnome.nautilus.qubes.gschema.override
@@ -678,6 +677,7 @@ rm -f %{name}-%{version}
 %{python_sitelib}/qubesagent/__init__.py*
 %{python_sitelib}/qubesagent/firewall.py*
 %{python_sitelib}/qubesagent/test_firewall.py*
+%{python_sitelib}/qubesagent/xdg.py*
 
 /usr/share/qubes/mime-override/globs
 /usr/share/qubes/qubes-master-key.asc