diff --git a/Makefile b/Makefile
index 33758e1..443eb94 100644
--- a/Makefile
+++ b/Makefile
@@ -5,12 +5,15 @@ MN = bin/mn
 BIN = $(MN)
 PYSRC = $(MININET) $(TEST) $(EXAMPLES) $(BIN)
 MNEXEC = mnexec
+MANPAGE = mn.1
 P8IGN = E251,E201,E302,E202
+BINDIR = /usr/bin
+MANDIR = /usr/share/man/man1
 
 all: codecheck test
 
 clean:
-	rm -rf build dist *.egg-info *.pyc $(MNEXEC)
+	rm -rf build dist *.egg-info *.pyc $(MNEXEC) $(MANPAGE)
 
 codecheck: $(PYSRC)
 	-echo "Running code check"
@@ -27,17 +30,20 @@ test: $(MININET) $(TEST)
 	-echo "Running tests"
 	mininet/test/test_nets.py
 
-install: $(MNEXEC)
-	install $(MNEXEC) /usr/local/bin/
+install: $(MNEXEC) $(MANPAGE)
+	install $(MNEXEC) $(BINDIR)
+	install $(MANPAGE) $(MANDIR)
 	python setup.py install
 
-develop: $(MNEXEC)
-	install $(MNEXEC) /usr/local/bin/
+develop: $(MNEXEC) $(MANPAGE)
+	# Perhaps we should link these as well
+	install $(MNEXEC) $(BINDIR)
+	install $(MANPAGE) $(MANDIR)
 	python setup.py develop
 
-man: mn.1
+man: $(MANPAGE)
 
-mn.1: $(MN)
+$(MANPAGE): $(MN)
 	help2man -N -n "create a Mininet network." --no-discard-stderr $(MN) \
     -o $@
 
diff --git a/debian/mininet.manpages b/debian/mininet.manpages
new file mode 100644
index 0000000..f7e585b
--- /dev/null
+++ b/debian/mininet.manpages
@@ -0,0 +1 @@
+*.1
diff --git a/debian/rules b/debian/rules
index b587d32..f1153d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,5 +4,6 @@
 	dh $@ --buildsystem=python_distutils --with=python2 
 
 override_dh_auto_build:
+	make man
 	make mnexec && cp mnexec bin/
 	dh_auto_build