diff --git a/Makefile b/Makefile
index 7c040770d67ece18dafcfd61d0fc314fd208c3d8..a52e9edf49b4996a99dad1658c93c9c19a12b1b7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,34 +1,35 @@
 PREFIX=/usr
 
-manpages=vcsh.1
+self=vcsh
+manpages=$(self).1
 all=test manpages
 
 all: $(all)
 
 install: all
 	install -d $(DESTDIR)$(PREFIX)/bin
-	install -m 0755 vcsh $(DESTDIR)$(PREFIX)/bin
+	install -m 0755 $(self) $(DESTDIR)$(PREFIX)/bin
 	install -d $(DESTDIR)$(PREFIX)/share/man/man1
-	install -m 0644 $(manpages)  $(DESTDIR)$(PREFIX)/share/man/man1
-	install -d $(DESTDIR)$(PREFIX)/share/doc/vcsh
-	install -m 0644 README.md $(DESTDIR)$(PREFIX)/share/doc/vcsh
-	install -m 0644 doc/hooks $(DESTDIR)$(PREFIX)/share/doc/vcsh
+	install -m 0644 $(manpages) $(DESTDIR)$(PREFIX)/share/man/man1
+	install -d $(DESTDIR)$(PREFIX)/share/doc/$(self)
+	install -m 0644 README.md $(DESTDIR)$(PREFIX)/share/doc/$(self)
+	install -m 0644 doc/hooks $(DESTDIR)$(PREFIX)/share/doc/$(self)
 	install -d $(DESTDIR)$(PREFIX)/share/zsh/vendor-completions
-	install -m 0644 _vcsh $(DESTDIR)$(PREFIX)/share/zsh/vendor-completions
+	install -m 0644 _$(self) $(DESTDIR)$(PREFIX)/share/zsh/vendor-completions
 
 manpages: $(manpages)
 
-vcsh.1: doc/vcsh.1.ronn
-	ronn < doc/vcsh.1.ronn > vcsh.1
+$(self).1: doc/$(self).1.ronn
+	ronn < doc/$(self).1.ronn > $(self).1
 
 clean:
-	rm -rf vcsh.1
+	rm -rf $(self).1
 
 uninstall:
-	rm -rf $(DESTDIR)$(PREFIX)/bin/vcsh
-	rm -rf $(DESTDIR)$(PREFIX)/share/man/man1/vcsh.1
-	rm -rf $(DESTDIR)$(PREFIX)/share/doc/vcsh
-	rm -rf $(DESTDIR)$(PREFIX)/share/zsh/vendor-completions/_vcsh
+	rm -rf $(DESTDIR)$(PREFIX)/bin/$(self)
+	rm -rf $(DESTDIR)$(PREFIX)/share/man/man1/$(self).1
+	rm -rf $(DESTDIR)$(PREFIX)/share/doc/$(self)
+	rm -rf $(DESTDIR)$(PREFIX)/share/zsh/vendor-completions/_$(self)
 
 # Potentially harmful, used a non-standard option on purpose.
 # If PREFIX=/usr/local and that's empty...
diff --git a/changelog b/changelog
index dd29bf41760c97acef6bb9a60cf903d7b64b1ce4..bfc4d24064c924d5c6d9bf4659d91a73279e146d 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,8 @@
+2012-02-27  Richard Hartmann <richih.mailinglist@gmail.com>
+
+	* Refactor Makefile
+	* Fix license information in manpage
+
 2012-02-15  Richard Hartmann <richih.mailinglist@gmail.com>
 
 	* Introduce `vcsh which`
diff --git a/doc/vcsh.1.ronn b/doc/vcsh.1.ronn
index cc66e075b9ff4b49d220ce9579c95fbce2809589..76ae2a50920cb57db994787ada87f9ba5cb1e38a 100644
--- a/doc/vcsh.1.ronn
+++ b/doc/vcsh.1.ronn
@@ -180,7 +180,7 @@ This manpage and `vcsh` itself were written by Richard "RichiH" Hartmann.
 
 Copyright 2011-2012 Richard Hartmann <richih.mailinglist@gmail.com>
 
-Licensed under the GNU GPL version 3 or higher.
+Licensed under the GNU GPL version 2 or higher.
 
 https://github.com/RichiH/vcsh