diff --git a/Makefile b/Makefile
index 66f86e6..6ed64dd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,14 @@
 CC=		gcc
-LDFLAGS=	-L/usr/lib	-L/usr/local/lib  	-L/usr/lib/ncurses	-L/usr/local/lib/ncurses
-CPPFLAGS=	-I/usr/include	-I/usr/local/include	-I/usr/include/ncurses	-I/usr/local/include/ncurses
-CFLAGS=		-O3 -Wall #-std=c99 
+#LDFLAGS=	-L/usr/lib	-L/usr/local/lib  	-L/usr/lib/ncurses	-L/usr/local/lib/ncurses
+#CPPFLAGS=	-I/usr/include	-I/usr/local/include	-I/usr/include/ncurses	-I/usr/local/include/ncurses
+#CFLAGS=		-O3 -Wall #-std=c99 
 #CFLAGS+= -ffunction-sections -fdata-sections
 #LDFLAGS+= --gc-sections 
-LIBS=		-lncurses
+CFLAGS=		$(shell pkg-config --cflags ncurses)
+LIBS=		$(shell pkg-config --libs ncurses)
 DESTDIR=	/usr/local/
+MANDIR=		/man
+BINDIR=		/bin
 
 OFILES=buffers.o \
 	configfile.o \
@@ -27,19 +30,12 @@ dhex:	$(OFILES)
 	$(CC) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
 
 install:all
-	strip dhex
-	cp dhex $(DESTDIR)/bin
-	cp dhex.1 $(DESTDIR)/man/man1
-	cp dhexrc.5 $(DESTDIR)/man/man5
-	cp dhex_markers.5 $(DESTDIR)/man/man5
-	cp dhex_searchlog.5 $(DESTDIR)/man/man5
-
-	
+	install -Dpm 755 dhex $(DESTDIR)$(BINDIR)
+	install -Dpm 644 dhex.1 $(DESTDIR)$(MANDIR)/man1
+	install -Dpm 644 -t $(DESTDIR)$(MANDIR)/man5 dhexrc.5 dhex_markers.5 dhex_searchlog.5
 
 .c.o:
 	$(CC) $< -c -I. $(CPPFLAGS) $(CFLAGS) $(OPTIONS)
 
 clean:
 	rm -f dhex $(OFILES)
-
-