diff --git a/Makefile b/Makefile
index 58e88b07..853ef038 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,8 @@ install:
 	cp src/sparklepony /usr/local/bin/
 	chmod 755 /usr/local/bin/sparklepony
 	cp data/icons /usr/share/ -R
+	mkdir -p ~/.config/autostart
+	cp sparklepony.desktop.in ~/.config/autostart/sparklepony.desktop
 
 uninstall:
 	rm /usr/local/bin/sparklepony
@@ -16,6 +18,7 @@ uninstall:
 	rm /usr/share/icons/hicolor/*x*/places/folder-publicshare.png
 	rm /usr/share/icons/hicolor/*x*/status/document-*ed.png
 	rm /usr/share/icons/hicolor/*x*/status/avatar-default.png
+	rm ~/.config/autostart/sparklepony.desktop
 
 clean:
 	rm src/SparklePony.exe
diff --git a/README b/README
index b66c2669..269d5980 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ SparklePony is not designed to be:
 In contrast to the projects name, we will very likely 
 refuse to implement your personal ponies. :)
 
-SparklePony currently only works on Linux.
+SparklePony currently only works on Linux/GNOME.
 Windows and OSX versions are planned for the future.
 
 
diff --git a/sparklepony.desktop.in b/sparklepony.desktop.in
index 54996da8..5e8d5133 100644
--- a/sparklepony.desktop.in
+++ b/sparklepony.desktop.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Collaboration Folders
+Name=SparklePony
 Exec=sparklepony start
 Icon=folder-publicshare
 Terminal=false