diff --git a/Makefile b/Makefile
index ff79c54..0e49af7 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,31 @@ RELEASE_DIR := $(BUILD_DIR)/release
 DEBUG_DIR   := $(BUILD_DIR)/debug
 BINARY      := stj
 CORES       := $(shell nproc --all)
+PREFIX      := /usr/local
+MANPREFIX   := $(PREFIX)/share/man
 
 all: debug
 .PHONY: all
 
 
+# Installation & removal
+install: release
+	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	cp -f build/release/stj $(DESTDIR)$(PREFIX)/bin
+	chmod 755 $(DESTDIR)$(PREFIX)/bin/stj
+	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
+	sed "s/VERSION/$(VERSION)/g" < data/stj.1 > $(DESTDIR)$(MANPREFIX)/man1/stj.1
+	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/stj.1
+	tic -sx data/stj.info
+	cp -f data/stj.desktop $(DESTDIR)$(PREFIX)/share/applications
+
+uninstall:
+	rm -f $(DESTDIR)$(PREFIX)/bin/stj
+	rm -f $(DESTDIR)$(MANPREFIX)/man1/stj.1
+	rm -f $(DESTDIR)$(PREFIX)/share/applications/stj.desktop
+
+
+# Full clean
 clean:
 	@ [ ! -e '$(BINARY)' ] || rm '$(BINARY)'
 	@ rm -rf '$(BUILD_DIR)'
diff --git a/data/st.1 b/data/stj.1
similarity index 100%
rename from data/st.1
rename to data/stj.1
diff --git a/data/stj.desktop b/data/stj.desktop
new file mode 100644
index 0000000..db543c9
--- /dev/null
+++ b/data/stj.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=stj
+Comment=Jef's build of the st terminal
+Icon=utilities-terminal
+Exec=stj
+Categories=System;TerminalEmulator
diff --git a/data/st.info b/data/stj.info
similarity index 100%
rename from data/st.info
rename to data/stj.info