diff --git a/client/Makefile.in b/client/Makefile.in
index 34a7df5..9ff6e81 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -35,11 +35,11 @@ fence_virt: ${fence_virt_SOURCES:.c=.o}
 	$(CC) $(CFLAGS) -c -o $@ $^ $(INCLUDES)
 
 install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir} ; \
+	if [ ! -d ${DESTDIR}/${sbindir} ]; then \
+		install -d ${DESTDIR}/${sbindir} ; \
 	fi
-	install -m755 ${TARGET} ${sbindir}
-	ln -snf ${sbindir}/${TARGET} ${sbindir}/${LINK}
+	install -m755 ${TARGET} ${DESTDIR}/${sbindir}
+	cp -a ${LINK} ${DESTDIR}/${sbindir}
 
 clean:
 	rm -f ${TARGET} ${LINK} *.o *.d *~
diff --git a/config/Makefile.in b/config/Makefile.in
index 2997df5..9fae536 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -48,6 +48,6 @@ clean:
 	rm -f ${TARGETS} *~ *.o testprog config.tab.c config.tab.h config.c
 
 install:
-	if [ ! -f /etc/fence_virt.conf ]; then \
-		install -m 0644 example.conf /etc/fence_virt.conf; \
+	if [ ! -f ${DESTDIR}/etc/fence_virt.conf ]; then \
+		install -m 0644 example.conf ${DESTDIR}/etc/fence_virt.conf; \
 	fi
diff --git a/configure.in b/configure.in
index bc2179e..6540d94 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(fence_virt, 0.1, lon@metamorphism.com)
+AC_INIT(fence-virt, 0.1, lon@metamorphism.com)
 AC_CONFIG_SRCDIR([server/main.c])
 AC_CONFIG_HEADER([include/config.h])
 
diff --git a/server/Makefile.in b/server/Makefile.in
index 9697d38..3a0394d 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -115,15 +115,15 @@ checkpoint.so: ${checkpoint_so_SOURCES:.c=.o}
 	$(CC) $(CFLAGS) -c -o $@ $^ $(INCLUDES)
 
 install: all
-	if [ ! -d ${sbindir} ]; then \
-		install -d ${sbindir} ; \
+	if [ ! -d ${DESTDIR}/${sbindir} ]; then \
+		install -d ${DESTDIR}/${sbindir} ; \
 	fi
-	install -m755 ${TARGETS} ${sbindir}
+	install -m755 ${TARGETS} ${DESTDIR}/${sbindir}
 ifeq ($(with_modules),yes)
-	if [ ! -d ${MODULE_PATH} ]; then \
-		install -d ${MODULE_PATH} ; \
+	if [ ! -d ${DESTDIR}/${MODULE_PATH} ]; then \
+		install -d ${DESTDIR}/${MODULE_PATH} ; \
 	fi
-	install -m755 ${MODULES} ${MODULE_PATH}
+	install -m755 ${MODULES} ${DESTDIR}/${MODULE_PATH}
 endif
 
 clean: