diff --git a/.gitignore b/.gitignore
index b7c9739..9881fec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-pbzip2-1.1.1.tar.gz
+*.tar.*
diff --git a/pbzip2-1.1.6-buildflags.patch b/pbzip2-1.1.6-buildflags.patch
new file mode 100644
index 0000000..2fb2f42
--- /dev/null
+++ b/pbzip2-1.1.6-buildflags.patch
@@ -0,0 +1,21 @@
+diff -up pbzip2-1.1.6/Makefile~ pbzip2-1.1.6/Makefile
+--- pbzip2-1.1.6/Makefile~	2011-10-30 21:22:47.000000000 +0200
++++ pbzip2-1.1.6/Makefile	2012-06-01 23:42:11.653480198 +0300
+@@ -3,7 +3,7 @@ SHELL = /bin/sh
+ 
+ # Compiler to use
+ CC = g++
+-CFLAGS = -O2
++CFLAGS ?= -O2
+ #CFLAGS += -g -Wall
+ #CFLAGS += -ansi
+ #CFLAGS += -pedantic
+@@ -37,7 +37,7 @@ CFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION
+ CFLAGS += -pthread
+ 
+ # External libraries
+-LDFLAGS = -lbz2
++LDFLAGS += -lbz2
+ LDFLAGS += -lpthread
+ 
+ # Where you want pbzip2 installed when you do 'make install'
diff --git a/pbzip2.spec b/pbzip2.spec
index 2f31749..c83e0d4 100644
--- a/pbzip2.spec
+++ b/pbzip2.spec
@@ -1,17 +1,18 @@
 Name:		pbzip2
-Version:	1.1.1
-Release:	3%{?dist}
+Version:	1.1.6
+Release:	1%{?dist}
 Summary:	Parallel implementation of bzip2
 URL:		http://www.compression.ca/pbzip2/
 License:	BSD
 Group:		Applications/File
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{?suse_version:1}0
-BuildRequires:  bzip2
+BuildRequires:	bzip2
 %else
-BuildRequires:  bzip2-devel
+BuildRequires:	bzip2-devel
 %endif
 Source0:	http://www.compression.ca/pbzip2/%{name}-%{version}.tar.gz
+Patch0:		%{name}-1.1.6-buildflags.patch
 
 %description
 PBZIP2 is a parallel implementation of the bzip2 block-sorting file
@@ -23,11 +24,12 @@ decompressed with bzip2).
 
 %prep
 %setup -q
-sed -i -e 's/ -O2/ %{optflags} /' Makefile
+%patch0 -p1
+f=AUTHORS; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 && mv $f.utf8 $f
 
 
 %build
-make
+CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" make %{?_smp_mflags}
 
 
 %install
@@ -52,6 +54,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jun  1 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.1.6-1
+- Update to 1.1.6.
+- Build with %%{?__global_ldflags} and %%{?_smp_mflags}.
+- Fix some rpmlint warnings.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 934da08..7b25454 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b354422759da7113da366aad1876ed5d  pbzip2-1.1.1.tar.gz
+26cc5a0d882198f106e75101ff0544a3  pbzip2-1.1.6.tar.gz