diff --git a/.gitignore b/.gitignore
index 4c1e1f9..dafa321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-pigz-2.1.6.tar.gz
-/pigz-2.2.3.tar.gz
-/pigz-2.2.4.tar.gz
+/*.tar.*
diff --git a/pigz-2.2.4-ldflags.patch b/pigz-2.2.4-ldflags.patch
new file mode 100644
index 0000000..4a3b52b
--- /dev/null
+++ b/pigz-2.2.4-ldflags.patch
@@ -0,0 +1,12 @@
+diff -up pigz-2.2.4/Makefile~ pigz-2.2.4/Makefile
+--- pigz-2.2.4/Makefile~	2012-02-12 07:18:18.000000000 +0200
++++ pigz-2.2.4/Makefile	2012-06-13 00:42:38.701204688 +0300
+@@ -2,7 +2,7 @@ CC=cc
+ CFLAGS=-O3 -Wall -Wextra
+ 
+ pigz: pigz.o yarn.o
+-	$(CC) -o pigz pigz.o yarn.o -lpthread -lz
++	$(CC) -o pigz pigz.o yarn.o -lpthread -lz ${RPM_LD_FLAGS}
+ 	ln -f pigz unpigz
+ 
+ pigz.o: pigz.c yarn.h
diff --git a/pigz.spec b/pigz.spec
index fbbd027..9f4e1c8 100644
--- a/pigz.spec
+++ b/pigz.spec
@@ -1,15 +1,17 @@
 Name:           pigz
-Version:        2.2.4
-Release:        2%{?dist}
+Version:        2.2.5
+Release:        1%{?dist}
 Summary:        Parallel implementation of gzip
 
 Group:          Applications/File
 License:        zlib
 URL:            http://www.zlib.net/pigz/
 Source0:        http://www.zlib.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         %{name}-2.2.4-ldflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
+BuildRequires:  ncompress
 
 %description
 pigz, which stands for parallel implementation of gzip,
@@ -18,6 +20,7 @@ multiple processors and multiple cores to the hilt when compressing data.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -27,9 +30,12 @@ make %{?_smp_mflags} CFLAGS='%{optflags}'
 %install
 rm -rf $RPM_BUILD_ROOT
 install -p -D pigz $RPM_BUILD_ROOT%{_bindir}/pigz
-install -p -D unpigz $RPM_BUILD_ROOT%{_bindir}/unpigz
+pushd $RPM_BUILD_ROOT%{_bindir}; ln pigz unpigz; popd
 install -p -D pigz.1 -m 0644 $RPM_BUILD_ROOT%{_datadir}/man/man1/pigz.1
 
+%check
+make tests
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -43,6 +49,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jul 31 2012 Ville Skyttä <ville.skytta@iki.fi> - 2.2.5-1
+- Update to 2.2.5.
+- Hardlink binaries instead of shipping duplicates (#785834).
+- Build with $RPM_LD_FLAGS.
+- Run test suite during build.
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 5b61457..a02b960 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9df2a3c742524446fa4e797c17e8fd85  pigz-2.2.4.tar.gz
+188f769ccedc403893d03049ad31e969  pigz-2.2.5.tar.gz