diff --git a/autogen.sh b/autogen.sh
new file mode 100644
index 0000000..3faf898
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+
+olddir=`pwd`
+cd "$srcdir"
+
+mkdir -p m4
+
+AUTORECONF=`which autoreconf`
+if test -z ${AUTORECONF}; then
+        echo "*** No autoreconf found, please intall it ***"
+        exit 1
+else
+  autoreconf -vif || exit $?
+fi
+
+PKGCONFIG=`which pkg-config`
+if test -z "$PKGCONFIG"; then
+  echo "*** pkg-config not found, please install it ***"
+  exit 1
+fi
+
+pkg-config --print-errors gobject-introspection-1.0
+if [ "$?" != 0 ]; then
+  echo "You probably need to install 'libgirepository1.0-dev'"
+  exit 1
+fi
+
+# README and INSTALL are required by automake, but may be deleted by clean
+# up rules. to get automake to work, simply touch these here, they will be
+# regenerated from their corresponding *.in files by ./configure anyway.
+touch README INSTALL
+
+cd "$olddir"
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
diff --git a/java-atk-wrapper.changes b/java-atk-wrapper.changes
index 43f534b..8e5578a 100644
--- a/java-atk-wrapper.changes
+++ b/java-atk-wrapper.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Oct 24 13:28:45 UTC 2017 - fstrba@suse.com
+
+- Remove the distributed AtkWrapper.java file before building,
+  so that a correct version with the correct path to xprops can be
+  generated during the build from AtkWrapper.java.in
+
 -------------------------------------------------------------------
 Tue Oct 10 16:35:27 UTC 2017 - fstrba@suse.com
 
diff --git a/java-atk-wrapper.spec b/java-atk-wrapper.spec
index cb36824..b6672e2 100644
--- a/java-atk-wrapper.spec
+++ b/java-atk-wrapper.spec
@@ -26,12 +26,13 @@ Group:          Development/Libraries/Java
 Url:            http://git.gnome.org/browse/java-atk-wrapper/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{major_version}/%{name}-%{version}.tar.xz
 Source1:        HOWTO
-Source2:        manifest.txt
+Source2:        https://git.gnome.org/browse/java-atk-wrapper/plain/wrapper/manifest.txt
+Source3:        https://git.gnome.org/browse/java-atk-wrapper/plain/autogen.sh
 # Avoid libtool versioning; this library is dynamically loaded from Java code
 Patch0:         jaw-avoid-version.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
-BuildRequires:  java-devel >= 1.7.0
+BuildRequires:  java-devel >= 1.7
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  xprop
@@ -44,8 +45,9 @@ BuildRequires:  pkgconfig(gdk-2.0)
 BuildRequires:  pkgconfig(gdk-3.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32.0
 BuildRequires:  pkgconfig(gobject-2.0)
+BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gthread-2.0)
-Requires:       java >= 1.7.0
+Requires:       java >= 1.7
 Requires:       xprop
 
 %description
@@ -63,10 +65,12 @@ change of underlying communication mechanism.
 %patch0 -p1
 cp %{SOURCE1} .
 cp %{SOURCE2} wrapper/
+cp %{SOURCE3} .
+rm -f wrapper/org/GNOME/Accessibility/AtkWrapper.java
 
 %build
-libtoolize --force --copy --install
-autoreconf -fi
+chmod +x autogen.sh
+./autogen.sh
 %configure JAVACFLAGS="-source 1.7 -target 1.7" --libdir=%{_libdir}/%{name}
 make %{?_smp_mflags}