diff --git a/.gitignore b/.gitignore
index 6373465..20c27ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /gphoto2-2.4.14.tar.bz2
 /gphoto2-2.5.0.tar.bz2
+/gphoto2-2.5.1.tar.bz2
diff --git a/gphoto2.spec b/gphoto2.spec
index 0eeffd6..b538a56 100644
--- a/gphoto2.spec
+++ b/gphoto2.spec
@@ -1,16 +1,15 @@
-Summary: Software for accessing digital cameras
-Name: gphoto2
-Version: 2.5.0
-Release: 5%{?dist}
-License: GPLv2+
-Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
-Url: http://www.gphoto.org/
-BuildRequires: libgphoto2-devel >= %{version}, gettext
-BuildRequires: libjpeg-devel, readline-devel
-BuildRequires: libtool, sharutils
-BuildRequires: libtool-ltdl-devel, popt-devel
+Name:           gphoto2
+Version:        2.5.1
+Release:        1%{?dist}
+Summary:        Software for accessing digital cameras
+Group:          Applications/Multimedia
+License:        GPLv2+
+Url:            http://www.gphoto.org/
+Source0:        http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
+BuildRequires:  libgphoto2-devel >= %{version}, gettext
+BuildRequires:  libjpeg-devel, readline-devel
+BuildRequires:  libtool, sharutils
+BuildRequires:  libtool-ltdl-devel, popt-devel
 
 %description
 The gPhoto2 project is a universal, free application and library
@@ -24,32 +23,38 @@ This package contains the command-line utility gphoto2.
 
 Other (GUI) frontends are available separately.
 
+
 %prep
 %setup -q
+mv ChangeLog ChangeLog.tmp
+iconv -f iso8859-1 -t utf-8 < ChangeLog.tmp > ChangeLog
+touch -r ChangeLog.tmp ChangeLog
+rm ChangeLog.tmp
+
 
 %build
 %configure
 make %{?_smp_mflags}
-mv ChangeLog ChangeLog.tmp
-iconv -f iso8859-1 -t utf-8 < ChangeLog.tmp > ChangeLog
-rm -f ChangeLog.tmp
+
 
 %install
-rm -rf %{buildroot}
-make install INSTALL="%{__install} -p" DESTDIR=%{buildroot}
-rm -rf %{buildroot}%{_docdir}/%{name}/*.sh
+%make_install INSTALL="install -p"
+rm $RPM_BUILD_ROOT%{_docdir}/%{name}/test-hook.sh
 %find_lang %{name}
 
-%clean
-rm -rf %{buildroot}
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README TODO
 %{_bindir}/gphoto2
 %{_mandir}/man1/gphoto2.1*
 
+
 %changelog
+* Thu May  2 2013 Hans de Goede <hdegoede@redhat.com> - 2.5.1-1
+- New upstream release 2.5.1
+- This adds aarch64 support (rhbz#925472)
+- Modernize spec-file
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -235,7 +240,7 @@ rm -rf %{buildroot}
 * Fri Mar 03 2006 Radek Vokál <rvokal@redhat.com> 2.1.99-7
 - remove .la files (#183367) 
 
-* Wed Mar 02 2006 Ray Strode <rstrode@redhat.com> 2.1.99-6
+* Thu Mar 02 2006 Ray Strode <rstrode@redhat.com> 2.1.99-6
 - potentially work around bug 183371 by looping/checking for
   5 seconds.
 
diff --git a/sources b/sources
index 1be9faa..a8d6656 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-60fd6e44d89592f6172227be67227636  gphoto2-2.4.14.tar.bz2
-64c6d291c5bd50388af0c51da71efb59  gphoto2-2.5.0.tar.bz2
+03cda6d5b7c647ac4c90d0081f2cb7c7  gphoto2-2.5.1.tar.bz2