diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..065bf06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.o
+
+/dwm
+/dwm-*.tar.gz
diff --git a/Makefile b/Makefile
index 77bcbc0..33522bf 100644
--- a/Makefile
+++ b/Makefile
@@ -19,9 +19,6 @@ options:
 
 ${OBJ}: config.h config.mk
 
-config.h:
-	cp config.def.h $@
-
 dwm: ${OBJ}
 	${CC} -o $@ ${OBJ} ${LDFLAGS}
 
@@ -40,12 +37,25 @@ install: all
 	mkdir -p ${DESTDIR}${PREFIX}/bin
 	cp -f dwm ${DESTDIR}${PREFIX}/bin
 	chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
+	
 	mkdir -p ${DESTDIR}${MANPREFIX}/man1
 	sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
 	chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
 
+xinstall: install
+	mkdir -p ${DESTDIR}${ICONSPREFIX}
+	cp -f dwm.png ${DESTDIR}${ICONSPREFIX}
+	chmod 644 ${DESTDIR}${ICONSPREFIX}/dwm.png
+	
+	mkdir -p ${DESTDIR}${XSESSIONSPREFIX}
+	cp -f dwm.desktop ${DESTDIR}${XSESSIONSPREFIX}
+	chmod 644 ${DESTDIR}${XSESSIONSPREFIX}/dwm.desktop
+
 uninstall:
-	rm -f ${DESTDIR}${PREFIX}/bin/dwm\
-		${DESTDIR}${MANPREFIX}/man1/dwm.1
+	rm -f \
+		${DESTDIR}${PREFIX}/bin/dwm \
+		${DESTDIR}${MANPREFIX}/man1/dwm.1 \
+		${DESTDIR}${ICONSPREFIX}/dwm.png \
+		${DESTDIR}${XSESSIONSPREFIX}/dwm.desktop
 
 .PHONY: all options clean dist install uninstall
diff --git a/config.def.h b/config.def.h
index a2ac963..9e20858 100644
--- a/config.def.h
+++ b/config.def.h
@@ -28,7 +28,6 @@ static const Rule rules[] = {
 	 */
 	/* class      instance    title       tags mask     isfloating   monitor */
 	{ "Gimp",     NULL,       NULL,       0,            1,           -1 },
-	{ "Firefox",  NULL,       NULL,       1 << 8,       0,           -1 },
 };
 
 /* layout(s) */
diff --git a/config.h b/config.h
new file mode 120000
index 0000000..c6d6219
--- /dev/null
+++ b/config.h
@@ -0,0 +1 @@
+config.def.h
\ No newline at end of file
diff --git a/config.mk b/config.mk
index 7084c33..43eea57 100644
--- a/config.mk
+++ b/config.mk
@@ -5,8 +5,13 @@ VERSION = 6.2
 
 # paths
 PREFIX = /usr/local
+SYSPREFIX = /usr
+
 MANPREFIX = ${PREFIX}/share/man
 
+ICONSPREFIX = ${SYSPREFIX}/share/icons
+XSESSIONSPREFIX = ${SYSPREFIX}/share/xsessions
+
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
diff --git a/dwm.desktop b/dwm.desktop
new file mode 100644
index 0000000..af6bd46
--- /dev/null
+++ b/dwm.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=dwm
+Comment=Dynamic Window Manager
+Exec=dwm
+Icon=dwm
+Type=XSession