--- a/crawl-ref/source/Makefile.orig	2016-05-05 17:37:55.000000000 +0200
+++ b/crawl-ref/source/Makefile	2016-06-03 21:19:03.840066325 +0200
@@ -121,7 +121,7 @@
 CFOTHERS += -mfpmath=sse -msse2
 endif
 CFWARN := 
-CFWARN_L := -Wall -Wformat-security -Wundef
+CFWARN_L := -Wundef
 
 DEFINES := $(EXTERNAL_DEFINES)
 
@@ -385,7 +385,7 @@
 ifneq ($(patsubst %/,%,$(prefix)),/usr)
 bin_prefix    := bin
 else
-bin_prefix    := games
+bin_prefix    := bin
 endif
 endif
 
@@ -397,6 +397,8 @@
 # SAVEDIR := saves/
 # DATADIR := data/
 ifneq (,$(FHS))
+LICENSEDIR    := share/licenses/crawl
+DOCDIR        := share/doc/crawl
 DATADIR       := share/crawl
 SAVEDIR       := ~/.crawl
 endif
@@ -1397,9 +1397,8 @@
 	for LANG in $(LANGUAGES); \
 		do mkdir -p $(datadir_fp)/dat/descript/$$LANG; \
 	done
-	mkdir -p $(datadir_fp)/docs/develop
-	mkdir -p $(datadir_fp)/docs/develop/levels
-	mkdir -p $(datadir_fp)/docs/license
+	mkdir -p $(DESTDIR)$(prefix)/$(DOCDIR)/develop
+	mkdir -p $(DESTDIR)$(prefix)/$(DOCDIR)/develop/levels
 	mkdir -p $(datadir_fp)/settings
 	$(COPY_R) dat/des/* $(datadir_fp)/dat/des/
 	$(COPY_R) dat/dlua/* $(datadir_fp)/dat/dlua/
@@ -1407,11 +1408,10 @@
 	done
 	mkdir -p $(datadir_fp)/dat/dist_bones
 	$(COPY) dat/dist_bones/* $(datadir_fp)/dat/dist_bones/
-	$(COPY) ../docs/*.txt $(datadir_fp)/docs/
-	$(COPY) ../docs/develop/*.txt $(datadir_fp)/docs/develop/
-	$(COPY) ../docs/develop/levels/*.txt $(datadir_fp)/docs/develop/levels/
-	$(COPY) ../docs/license/*.txt $(datadir_fp)/docs/license/
-	$(COPY) ../CREDITS.txt $(datadir_fp)/docs/
+	$(COPY) ../docs/*.txt $(DESTDIR)$(prefix)/$(DOCDIR)/
+	$(COPY) ../docs/develop/*.txt $(DESTDIR)$(prefix)/$(DOCDIR)/develop/
+	$(COPY) ../docs/develop/levels/*.txt $(DESTDIR)$(prefix)/$(DOCDIR)/develop/levels/
+	$(COPY) ../CREDITS.txt $(DESTDIR)$(prefix)/$(DOCDIR)/
 	$(COPY_R) ../settings/* $(datadir_fp)/settings/
 ifeq ($(GAME),crawl.exe)
 	sed -i 's/$$/\r/' `find $(datadir_fp) -iname '*.txt' -o -iname '*.des'`
@@ -1471,7 +1471,6 @@
 install: all install-data
 	[ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix)
 	$(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/
-	$(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME)
 ifeq ($(USE_DGAMELAUNCH),)
 	$(CHOWN) $(INSTALL_UGRP) $(prefix_fp)/$(bin_prefix)/$(GAME) || true
 	$(CHMOD) $(MCHMOD) $(prefix_fp)/$(bin_prefix)/$(GAME) || true