diff --git a/.gitignore b/.gitignore
index efe4a67..825a67c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,4 +65,3 @@ CTestTestfile.cmake
 _deps
 
 build/
-dist/
diff --git a/Makefile b/Makefile
index 090c0a8..020350c 100644
--- a/Makefile
+++ b/Makefile
@@ -31,17 +31,13 @@ ${BUILD_DIR}: ${OBJ}
 clean:
 	rm -rf ${OBJ_DIR}
 
-dist: ${BUILD_DIR} archy-dwm.desktop
+dist: clean
 	mkdir -p archy-dwm_${VERSION}
-	cp -R LICENSE README.md ${BUILD_DIR} ${OBJ_DIR}/archy-dwm.desktop archy-dwm.1 dwm.png archy-dwm_${VERSION}
+	cp -R LICENSE Makefile README config.def.h config.mk \
+		archy-dwm.1 drw.h util.h ${SRC} dwm.png transient.c archy-dwm_${VERSION}
 	tar -cf archy-dwm_${VERSION}.tar archy-dwm_${VERSION}
 	gzip archy-dwm_${VERSION}.tar
 	rm -rf archy-dwm_${VERSION}
-	mkdir -p dist
-	mv archy-dwm_${VERSION}.tar.gz dist
-	echo "The tarball is ready."
-	printf "Tarball size: %s\n" $$(du -h dist/archy-dwm_${VERSION}.tar.gz | cut -f1)
-	printf "Tarball hash: %s\n" $$(sha256sum dist/archy-dwm_${VERSION}.tar.gz)
 
 install: all
 	mkdir -p ${DESTDIR}${PREFIX}/bin
@@ -51,22 +47,19 @@ install: all
 	sed "s/VERSION/${VERSION}/g" < archy-dwm.1 > ${DESTDIR}${MANPREFIX}/man1/archy-dwm.1
 	chmod 644 ${DESTDIR}${MANPREFIX}/man1/archy-dwm.1
 
-archy-dwm.desktop:
-	mkdir -p "$(OBJ_DIR)"
-	echo "[Desktop Entry]" > "$(OBJ_DIR)/archy-dwm.desktop"
-	echo "Type=XSession" >> "$(OBJ_DIR)/archy-dwm.desktop"
-	echo "Exec=$(DESTDIR)$(PREFIX)/bin/archy-dwm" >> "$(OBJ_DIR)/archy-dwm.desktop"
-	echo "DesktopNames=archy-dwm" >> "$(OBJ_DIR)/archy-dwm.desktop"
-	echo "Name=archy-dwm" >> "$(OBJ_DIR)/archy-dwm.desktop"
-	echo "Comment=\"A dynamic window manager for X\"" >> "$(OBJ_DIR)/archy-dwm.desktop"
-
-desktop: archy-dwm.desktop
-	mkdir -p ${DESTDIR}${PREFIX}/share/xsessions
-	cp "$(OBJ_DIR)/archy-dwm.desktop" ${DESTDIR}${PREFIX}/share/xsessions/archy-dwm.desktop
+desktop:
+	full_path=/usr/share/xsessions/archy-dwm.desktop
+	mkdir -p /usr/share/xsessions
+	cat <<EOT >> ${full_path}
+	[Desktop Entry]
+	Type=XSession
+	Exec=/usr/local/bin/archy-dwm
+	DesktopNames=archy-dwm
+	Name=archy-dwm
+	Comment="A dynamic window manager for X"
 
 uninstall:
 	rm -f ${DESTDIR}${PREFIX}/bin/archy-dwm \
-		${DESTDIR}${MANPREFIX}/man1/archy-dwm.1 \
-		${DESTDIR}${PREFIX}/share/xsessions/archy-dwm.desktop
+		${DESTDIR}${MANPREFIX}/man1/archy-dwm.1
 
 .PHONY: all options clean dist install uninstall
diff --git a/config.mk b/config.mk
index b1d4a03..9c19603 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
-# Archy DWM version
-VERSION = 1.0.0
+# yo-dwm version
+VERSION = 6.4-0.2.1
 
 # Customize below to fit your system
 
diff --git a/src/archy_dwm.c b/src/archy_dwm.c
index 2fdb156..f3640ea 100644
--- a/src/archy_dwm.c
+++ b/src/archy_dwm.c
@@ -2359,14 +2359,14 @@ zoom(const Arg *arg) {
 int
 main(int argc, char *argv[]) {
     if (argc == 2 && !strcmp("-v", argv[1]))
-        die("archy dwm-"
+        die("dwm-"
     VERSION);
     else if (argc != 1)
-        die("usage: archy-dwm [-v]");
+        die("usage: dwm [-v]");
     if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
         fputs("warning: no locale support\n", stderr);
     if (!(dpy = XOpenDisplay(NULL)))
-        die("archy-dwm: cannot open display");
+        die("dwm: cannot open display");
     checkotherwm();
     autostart_exec();
     setup();
diff --git a/src/config.h b/src/config.h
index 935d32f..c0c10ac 100644
--- a/src/config.h
+++ b/src/config.h
@@ -31,7 +31,7 @@ static const char dmenufont[] = "monospace:size=8";
 // Autostart programs
 static const char *const autostart[] = {
     // Start my build of slstatus
-    "archy-slstatus", NULL,
+    "yo-slstatus", NULL,
     NULL                           /* terminate */
 };