diff --git a/Makefile b/Makefile
index e4e48e30..52dc4a9b 100644
--- a/Makefile
+++ b/Makefile
@@ -67,16 +67,23 @@ clean:
 	rm -f repmgr
 	$(MAKE) -C sql clean
 
+# Get correct version numbers and install paths, depending on your postgres version
+PG_VERSION = $(shell pg_config --version | cut -d ' ' -f 2 | cut -d '.' -f 1,2)
+REPMGR_VERSION = $(shell grep REPMGR_VERSION version.h | cut -d ' ' -f 3 | cut -d '"' -f 2)
+PKGLIBDIR = $(shell pg_config --pkglibdir)
+SHAREDIR = $(shell pg_config --sharedir)
+
 deb: repmgrd repmgr
-	mkdir -p ./debian/usr/bin
-	cp repmgrd repmgr ./debian/usr/bin/
-	mkdir -p ./debian/usr/share/postgresql/9.0/contrib/
-	cp sql/repmgr_funcs.sql ./debian/usr/share/postgresql/9.0/contrib/
-	cp sql/uninstall_repmgr_funcs.sql ./debian/usr/share/postgresql/9.0/contrib/
-	mkdir -p ./debian/usr/lib/postgresql/9.0/lib/
-	cp sql/repmgr_funcs.so ./debian/usr/lib/postgresql/9.0/lib/
-	dpkg-deb --build debian
-	mv debian.deb ../postgresql-repmgr-9.0_1.0.0.deb
-	rm -rf ./debian/usr
+        mkdir -p ./debian/usr/bin
+        cp repmgrd repmgr ./debian/usr/bin/
+        mkdir -p ./debian$(SHAREDIR)/contrib/
+        cp sql/repmgr_funcs.sql ./debian$(SHAREDIR)/contrib/
+        cp sql/uninstall_repmgr_funcs.sql ./debian$(SHAREDIR)/contrib/
+        mkdir -p ./debian$(PKGLIBDIR)/
+        cp sql/repmgr_funcs.so ./debian$(PKGLIBDIR)/
+        dpkg-deb --build debian
+        mv debian.deb ../postgresql-repmgr-$(PG_VERSION)_$(REPMGR_VERSION).deb
+        rm -rf ./debian/usr
+