diff --git a/Makefile.in b/Makefile.in
index e59cb33ca..da7b0f9df 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,7 +25,6 @@ BUNDLE        = uv.app
 GUI_BUNDLE    = gui/QT/uv-qt.app
 DXT_GLSL_CFLAGS = @DXT_GLSL_CFLAGS@
 CUDA_COMPILER = @CUDA_COMPILER@
-DOCS 	      = README REPORTING-BUGS coding_standards.html
 SYSTEM	      = @system@
 
 GUI_TARGET    = @GUI_TARGET@
@@ -38,12 +37,14 @@ INSTALL = @INSTALL@
 bindir = @bindir@
 libdir = @libdir@
 datadir = @datadir@
-docdir = @docdir@/ultragrid/
 datarootdir = @datarootdir@
-uv_datadir = @datadir@/ultragrid/
+docdir = $(datarootdir)/doc/ultragrid
+uv_datadir = @datadir@/ultragrid
 srcdir        = @srcdir@
 VPATH         = @srcdir@
 
+DOCS 	      = $(srcdir)/README $(srcdir)/REPORTING-BUGS $(srcdir)/coding_standards.html
+
 # autogenerated headers
 GENERATED_HEADERS              = @GENERATED_HEADERS@
 
@@ -603,14 +604,14 @@ install: all
 	fi
 	if [ -n "@MODULES@" ]; then\
 		$(INSTALL) -d -m 755 $(DESTDIR)$(libdir)/ultragrid;\
-		$(INSTALL) -m 755 @MODULES@ $(DESTDIR)$(libdir)/ultragrid/;\
+		$(INSTALL) -m 755 @MODULES@ $(DESTDIR)$(libdir)/ultragrid;\
 	fi
 	$(INSTALL) -d -m 755 $(DESTDIR)$(uv_datadir)
-	$(INSTALL) -m 755 data/ultragrid-bugreport-collect.sh $(DESTDIR)$(uv_datadir)
+	$(INSTALL) -m 755 $(srcdir)/data/ultragrid-bugreport-collect.sh $(DESTDIR)$(uv_datadir)
 	$(INSTALL) -d -m 755 $(DESTDIR)$(docdir)
 	$(INSTALL) -m 644 $(DOCS) $(DESTDIR)$(docdir)
-	$(CP) COPYRIGHT $(DESTDIR)$(docdir)COPYRIGHT
-	$(CP) speex-1.2rc1/COPYING $(DESTDIR)$(docdir)COPYING.speex
+	$(INSTALL) -m 644 $(srcdir)/COPYRIGHT $(DESTDIR)$(docdir)
+	$(CP) $(srcdir)/speex-1.2rc1/COPYING $(DESTDIR)$(docdir)/COPYING.speex
 	if [ -n "@DLL_LIBS@" ]; then  $(INSTALL) -m 644 @DLL_LIBS@ $(DESTDIR)$(bindir); fi
 
 uninstall: