diff --git a/scrot/Makefile.am b/scrot/Makefile.am
index 10d27d3..cc74997 100644
--- a/scrot/Makefile.am
+++ b/scrot/Makefile.am
@@ -11,8 +11,8 @@ $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I.
 
 man_MANS = scrot.1
 
-docs_DATA = README AUTHORS ChangeLog TODO
-docsdir = $(prefix)/doc/scrot
+docs_DATA = AUTHORS ChangeLog TODO
+docsdir = $(datadir)/doc/scrot-$(VERSION)
 
 EXTRA_DIST = \
 scrot.spec scrot.1 $(docs_DATA)
diff --git a/scrot/acinclude.m4 b/scrot/acinclude.m4
index f5fdeb4..4471e79 100644
--- a/scrot/acinclude.m4
+++ b/scrot/acinclude.m4
@@ -26,7 +26,7 @@ dnl
 dnl @author Angus Lees <gusl@cse.unsw.edu.au>
 dnl @version $Id: acinclude.m4,v 1.1 2001/08/08 20:23:52 gilbertt Exp $
 
-AC_DEFUN(AC_PATH_GENERIC,
+AC_DEFUN([AC_PATH_GENERIC],
 [dnl
 dnl we're going to need uppercase, lowercase and user-friendly versions of the
 dnl string `LIBRARY'
diff --git a/scrot/src/Makefile.am b/scrot/src/Makefile.am
index ebd54b0..774cec1 100644
--- a/scrot/src/Makefile.am
+++ b/scrot/src/Makefile.am
@@ -1,13 +1,11 @@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in				
 
-LDFLAGS           = -L/usr/X11R6/lib
-INCLUDES          = -g -O3 -Wall -I/usr/X11R6/include \
-$(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. \
+INCLUDES          = -g -Wall $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. \
 -DPREFIX=\""$(prefix)"\" @GIBLIB_CFLAGS@
 LIBOBJS = @LIBOBJS@
 
 bin_PROGRAMS      = scrot
-scrot_SOURCES       = main.c getopt.c getopt1.c getopt.h scrot.h \
+scrot_SOURCES       = main.c scrot.h \
 options.c options.h debug.h imlib.c structs.h
 scrot_LDADD         = -lX11 @GIBLIB_LIBS@