diff --git a/xrdp/Makefile b/xrdp/Makefile
index af5ac23d..2579f3cd 100644
--- a/xrdp/Makefile
+++ b/xrdp/Makefile
@@ -6,11 +6,13 @@ XRDPOBJ = xrdp.o xrdp_process.o xrdp_listen.o \
           list.o file.o os_calls.o thread_calls.o \
           xrdp_mm.o
 
-DESTDIR = /usr/local/xrdp
 CFGDIR = /etc/xrdp
 PIDDIR = /var/run
 MANDIR = /usr/local/man
-DOCDIR = /usr/doc/xrdp
+LIBDIR = /usr/local/lib/xrdp
+BINDIR = /usr/local/bin
+SBINDIR = /usr/local/sbin
+SHAREDIR = /usr/local/share/xrdp
 
 DEFINES = -DXRDP_CFG_FILE=\"$(CFGDIR)/xrdp.ini\" \
           -DXRDP_PID_FILE=\"$(PIDDIR)/xrdp.pid\"
@@ -18,7 +20,7 @@ DEFINES = -DXRDP_CFG_FILE=\"$(CFGDIR)/xrdp.ini\" \
 CFLAGS = -Wall -O2 -I../common -I../libxrdp $(DEFINES)
 #CFLAGS += -DXRDP_DEBUG
 C_OS_FLAGS = $(CFLAGS) -c
-LDFLAGS = -L/usr/gnu/lib -L../libxrdp -Wl,-rpath,.
+LDFLAGS = -L/usr/gnu/lib -L../libxrdp -Wl,-rpath,$(LIBDIR)
 LIBS = -ldl -lpthread -lxrdp
 CC = gcc
 
@@ -31,14 +33,14 @@ clean:
 	rm -f $(XRDPOBJ) xrdp
 
 install:
-	install ad256.bmp $(DESTDIR)/ad256.bmp
-	install xrdp256.bmp $(DESTDIR)/xrdp256.bmp
-	install cursor0.cur $(DESTDIR)/cursor0.cur
-	install cursor1.cur $(DESTDIR)/cursor1.cur
-	install sans-10.fv1 $(DESTDIR)/sans-10.fv1
+	install ad256.bmp $(SHAREDIR)/ad256.bmp
+	install xrdp256.bmp $(SHAREDIR)/xrdp256.bmp
+	install cursor0.cur $(SHAREDIR)/cursor0.cur
+	install cursor1.cur $(SHAREDIR)/cursor1.cur
+	install sans-10.fv1 $(SHAREDIR)/sans-10.fv1
 	install xrdp.ini $(CFGDIR)/xrdp.ini
 	install rsakeys.ini $(CFGDIR)/rsakeys.ini
-	install xrdp $(DESTDIR)/xrdp
+	install xrdp $(SBINDIR)/xrdp
 
 list.o: ../common/list.c
 	$(CC) $(C_OS_FLAGS) ../common/list.c