diff --git a/nasm-2.10.09.tar.bz2 b/nasm-2.10.09.tar.bz2
deleted file mode 100644
index 690d40a..0000000
--- a/nasm-2.10.09.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7141180d3874b5967c6a60191e8d45fba9cc86bd60a4803ad80b6b6b3eac36b9
-size 826334
diff --git a/nasm-2.11.06.tar.xz b/nasm-2.11.06.tar.xz
new file mode 100644
index 0000000..a9a6fdc
--- /dev/null
+++ b/nasm-2.11.06.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:90f60d95a15b8a54bf34d87b9be53da89ee3d6213ea739fb2305846f4585868a
+size 763960
diff --git a/nasm.changes b/nasm.changes
index c3efe28..ea8faa6 100644
--- a/nasm.changes
+++ b/nasm.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Sat Feb 21 14:54:41 UTC 2015 - mpluskal@suse.com
+
+- Cleanup spec file with spec-cleaner
+- Update project url
+- Switch to .xz source
+- Update to 2.11.06:
+  * Add support for the Intel AVX-512 instruction set:
+  * 16 new, 512-bit SIMD registers. Total 32 (ZMM0 ~ ZMM31)
+  * 8 new opmask registers (K0 ~ K7). One of 7 registers (K1 ~ K7) 
+    can be used as an opmask for conditional execution.
+  * A new EVEX encoding prefix. EVEX is based on VEX and provides 
+    more capabilities: opmasks, broadcasting, embedded rounding and 
+    compressed displacements.
+  * Add support for ZWORD (512 bits), DZ and RESZ.
+  * Add support for the MPX and SHA instruction sets.
+  * Better handling of section redefinition.
+  * Generate manpages when running 'make dist'.
+  * Handle all token chains in mmacro params range.
+  * Support split [base,index] effective address:
+  * for more details see http://www.nasm.us/doc/nasmdocc.html
+
 -------------------------------------------------------------------
 Fri Jul 26 07:03:58 UTC 2013 - crrodriguez@opensuse.org
 
diff --git a/nasm.spec b/nasm.spec
index a6d4d39..18aad43 100644
--- a/nasm.spec
+++ b/nasm.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package nasm
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,13 @@
 
 
 Name:           nasm
-Url:            http://nasm.sourceforge.net/
-Version:        2.10.09
+Version:        2.11.06
 Release:        0
 Summary:        Netwide Assembler (An x86 Assembler)
 License:        BSD-2-Clause
 Group:          Development/Languages/Other
-Source:         http://www.nasm.us/pub/nasm/releasebuilds/%{version}/nasm-%{version}.tar.bz2
+Url:            http://www.nasm.us/
+Source:         http://www.nasm.us/pub/nasm/releasebuilds/%{version}/nasm-%{version}.tar.xz
 BuildRequires:  makeinfo
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -31,7 +31,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 NASM is a prototype general-purpose x86 assembler. It can currently
 output several binary formats, including ELF, a.out, Win32, and OS/2.
 
-Read the licence agreement in /usr/share/doc/packages/nasm/Licence.
+Read the licence agreement in %{_docdir}/nasm/Licence.
 
 %prep
 %setup -q
@@ -40,8 +40,9 @@ Read the licence agreement in /usr/share/doc/packages/nasm/Licence.
 Summary:        Documentation for Nasm
 License:        LGPL-2.1+
 Group:          Development/Languages/Other
-PreReq:         %install_info_prereq
-Provides:       nasm:/usr/share/doc/packages/nasm/nasmdoc.pdf
+Requires(post):  info
+Requires(preun): info
+Provides:       nasm:%{_docdir}/nasm/nasmdoc.pdf
 
 %description doc
 This package contains the documentation for Nasm.
@@ -52,27 +53,26 @@ TS=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
 sed -i "s/__DATE__/\"$TS\"/g" ver.c
 touch -r ./ver.c.stamp ./ver.c
 %configure
-make all
+make %{?_smp_mflags} all
 
-cd doc
-make html info nasmdoc.ps nasmdoc.txt
+make -C doc %{?_smp_mflags} html info nasmdoc.ps nasmdoc.txt
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT/usr/bin
-install -d -m 755 $RPM_BUILD_ROOT/%{_mandir}/man1
-install -d -m 755 $RPM_BUILD_ROOT/%{_docdir}/nasm
-install -d -m 755 $RPM_BUILD_ROOT/%{_docdir}/nasm/rdoff
-install -d -m 755 $RPM_BUILD_ROOT/%{_docdir}/nasm/html
-install -d -m 755 $RPM_BUILD_ROOT/%{_infodir}
-make INSTALLROOT=$RPM_BUILD_ROOT install
-make INSTALLROOT=$RPM_BUILD_ROOT rdf_install
+install -d -m 755 %{buildroot}%{_prefix}/bin
+install -d -m 755 %{buildroot}/%{_mandir}/man1
+install -d -m 755 %{buildroot}/%{_docdir}/nasm
+install -d -m 755 %{buildroot}/%{_docdir}/nasm/rdoff
+install -d -m 755 %{buildroot}/%{_docdir}/nasm/html
+install -d -m 755 %{buildroot}/%{_infodir}
+make INSTALLROOT=%{buildroot} install
+make INSTALLROOT=%{buildroot} rdf_install
 install -m 644 AUTHORS CHANGES ChangeLog LICENSE TODO README doc/*.txt \
-	$RPM_BUILD_ROOT/%{_docdir}/nasm
+	%{buildroot}/%{_docdir}/nasm
 install -m 644 rdoff/README rdoff/doc/* \
-	$RPM_BUILD_ROOT/%{_docdir}/nasm/rdoff
-install -m 644 doc/html/* $RPM_BUILD_ROOT%{_docdir}/nasm/html
-install -m 644 ndisasm.1 nasm.1 rdoff/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 doc/info/* $RPM_BUILD_ROOT%{_infodir}
+	%{buildroot}/%{_docdir}/nasm/rdoff
+install -m 644 doc/html/* %{buildroot}%{_docdir}/nasm/html
+install -m 644 ndisasm.1 nasm.1 rdoff/*.1 %{buildroot}%{_mandir}/man1
+install -m 644 doc/info/* %{buildroot}%{_infodir}
 
 %post doc
 %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
@@ -82,7 +82,7 @@ install -m 644 doc/info/* $RPM_BUILD_ROOT%{_infodir}
 
 %files
 %defattr(-,root,root)
-/usr/bin/*
+%{_bindir}/*
 %doc %{_mandir}/man1/*.1.gz
 
 %files doc