diff --git a/Makefile b/Makefile
index 441e101..2b2f61b 100644
--- a/Makefile
+++ b/Makefile
@@ -31,8 +31,8 @@ install: all
 	install -Dm644 "out/userChrome.css" \
 		"$(DESTDIR)/etc/mobile-config-firefox/userChrome.css"
 	install -Dm755 "src/mobile-config-firefox.sh" \
-		"$(DESTDIR)/usr/bin/mobile-config-firefox"
-	install -Dm644 "src/mobile-config-firefox.desktop" \
-		"$(DESTDIR)/usr/mobile-config/share/applications/org.mozilla.firefox.desktop"
+		"$(DESTDIR)/usr/mobile-config/bin/firefox"
+	install -Dm755 "src/mobile-config-path.sh" \
+		"$(DESTDIR)/etc/profile.d/mobile-config-path.sh"
 
 .PHONY: all clean install
diff --git a/src/mobile-config-firefox.desktop b/src/mobile-config-firefox.desktop
deleted file mode 100644
index 0b5c542..0000000
--- a/src/mobile-config-firefox.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Exec=mobile-config-firefox %u
-Icon=firefox
-Type=Application
-Terminal=false
-Name=Firefox
-GenericName=Web Browser
-MimeType=text/html;
-StartupNotify=true
-Categories=Network;WebBrowser;
-StartupWMClass=firefox
diff --git a/src/mobile-config-firefox.sh b/src/mobile-config-firefox.sh
index f5a21d5..57be005 100644
--- a/src/mobile-config-firefox.sh
+++ b/src/mobile-config-firefox.sh
@@ -23,9 +23,9 @@ for profiledir in ~/.mozilla/firefox/*/; do
 done
 
 if [ "$profile_found" = "true" ]; then
-	exec firefox "$@"
+	exec /usr/bin/firefox "$@"
 else
 	profiledir=~/.mozilla/firefox/firefox.default
 	prepare_profile "$profiledir"
-	exec firefox --profile "$profiledir" "$@"
+	exec /usr/bin/firefox --profile "$profiledir" "$@"
 fi
diff --git a/src/mobile-config-path.sh b/src/mobile-config-path.sh
new file mode 100644
index 0000000..d33dbb6
--- /dev/null
+++ b/src/mobile-config-path.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+export PATH="/usr/local/bin:/usr/mobile-config/bin:$PATH"