diff --git a/Makefile b/Makefile
index 8f8d975..88445c8 100644
--- a/Makefile
+++ b/Makefile
@@ -34,10 +34,10 @@ Makeconf:
 install: installbin installkeymaps
 
 installbin: rdesktop
-	mkdir -p $(BINDIR)
-	cp rdesktop $(BINDIR)
-	strip $(BINDIR)/rdesktop
-	chmod 755 $(BINDIR)/rdesktop
+	mkdir -p $(DESTDIR)/$(BINDIR)
+	cp rdesktop $(DESTDIR)/$(BINDIR)
+	strip $(DESTDIR)/$(BINDIR)/rdesktop
+	chmod 755 $(DESTDIR)/$(BINDIR)/rdesktop
 
 # installman: rdesktop.1
 #	mkdir -p $(MANDIR)/man1
@@ -45,13 +45,13 @@ installbin: rdesktop
 #	chmod 755 $(MANDIR)/man1/rdesktop.1
 
 installkeymaps:
-	mkdir -p $(KEYMAP_PATH)
+	mkdir -p $(DESTDIR)/$(KEYMAP_PATH)
 # Prevent copying the CVS directory
-	cp keymaps/?? $(KEYMAP_PATH)
-	cp keymaps/common $(KEYMAP_PATH)
-	cp keymaps/modifiers $(KEYMAP_PATH)
-	cp keymaps/README $(KEYMAP_PATH)
-	chmod 644 $(KEYMAP_PATH)/*
+	cp keymaps/?? $(DESTDIR)/$(KEYMAP_PATH)
+	cp keymaps/common $(DESTDIR)/$(KEYMAP_PATH)
+	cp keymaps/modifiers $(DESTDIR)/$(KEYMAP_PATH)
+	cp keymaps/README $(DESTDIR)/$(KEYMAP_PATH)
+	chmod 644 $(DESTDIR)/$(KEYMAP_PATH)/*
 
 proto:
 	cproto -DMAKE_PROTO -o proto.h *.c
diff --git a/configure b/configure
index 2b57160..ee8a11a 100755
--- a/configure
+++ b/configure
@@ -22,6 +22,9 @@ case $arg in
   --mandir=*)
     echo "MANDIR   = $optarg" >>Makeconf
     ;;
+  --sharedir=*)
+    echo "SHAREDIR   = $optarg" >>Makeconf
+    ;;
   --with-openssl*)
     echo "CFLAGS  += -DWITH_OPENSSL" >>Makeconf
     echo "LDLIBS  += -lcrypto" >>Makeconf
@@ -45,6 +48,7 @@ case $arg in
     echo " --exec-prefix=EPREFIX  location for architecture-dependent files"
     echo " --bindir=BINDIR        location for program binaries [EPREFIX/bin]"
     echo " --mandir=MANDIR        location for man pages [PREFIX/man]"
+    echo " --sharedir=SHAREDIR    location for architecture-independent shared files [PREFIX/share/rdesktop]"
     echo
     echo "Build configuration:"
     echo " --with-openssl         use system OpenSSL libraries for crypto"
diff --git a/rdesktop.spec b/rdesktop.spec
index d9ce519..fcc5d5f 100644
--- a/rdesktop.spec
+++ b/rdesktop.spec
@@ -20,11 +20,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %setup -n rdesktop
 %build 
-./configure --prefix=$RPM_BUILD_ROOT/usr
+./configure --prefix=/usr
 make
 
 %install
-make install 
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)