diff --git a/iproute2-3.5.1.tar.sign b/iproute2-3.5.1.tar.sign
deleted file mode 100644
index be6829e..0000000
--- a/iproute2-3.5.1.tar.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-iQIcBAABCAAGBQJQKRpzAAoJEICnf2CVzeR+mowP/3KoA933duQUH0FYkz7vPRmI
-808S/DxCDGwfD8y7+u7syFmFdlZmMXIIa2hDsXlr7pgCRFpGDj+migYcNrnV35Ug
-WeAJw4DJ2/MShQNbsromQFW4ZETh3c8xXDp9osmEPTg8BEsSruSXdK0b5eqUlhxj
-Cn2RMbwPKjo/QIDoBEBsLarw7CdYMZ8zIoTVLn6uz8sbDMrEAq5bydYrhP1eDp0G
-P5PkOE7ell+H15/l5C53JVLO4rMj2JXgJd9Mbckdbn7Sww9ObszCuIa14V3zzpPN
-DXaYAjsUodkqihMuqKCebE0iJ3e/xHtVmlTc2sHjzExCIpK+0LvueQC/e+icfGWC
-Hn3IGA4SsZFsSgQ2f4QX8+zDUy+1dZWN7ItIob/Uu0kuuUF4diEJbn9pIKhaxg1d
-QjOLVlUbamq3SNUTygEBYw6DIeNac+6uIxfZ+4hRoSrtt5ik5pszWsKpLwxNGUXe
-0Ky4nbb+PNapRlAQyLyGZTsKel5inGd8KLMjKJCvAf570zcm1arjcWVfErJD8Pi9
-sc3UsnmTdkugAGQxh071CSWpUWoNBLmJSjtsOMMj9v3d8RMJyreilAHtLDV2C1hf
-xEiod0pd1frAZafWj7pMMWdtKfgZj6t8exZzizHexPmmazaYxE4ZM+swE0Gw/UIB
-vU77GQfuNryGbPwtraJm
-=Yfl+
------END PGP SIGNATURE-----
diff --git a/iproute2-3.5.1.tar.xz b/iproute2-3.5.1.tar.xz
deleted file mode 100644
index 535636b..0000000
--- a/iproute2-3.5.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:36f2674e5436289f3ccfb0a58707aca9dcfa295d06afc36d2117674508f5ef72
-size 387984
diff --git a/iproute2-3.6.0.tar.sign b/iproute2-3.6.0.tar.sign
new file mode 100644
index 0000000..27d2974
--- /dev/null
+++ b/iproute2-3.6.0.tar.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQIcBAABCAAGBQJQaboqAAoJEICnf2CVzeR+ye4P/07YgipRse3NSLM0NIQ1ueUq
+vdhHu3wFi6HyXK17yiNPlw/1OAImLmyBXWPa9YD3TYtfLONeV8fbVAeXkETRhVWQ
+F5Oh7FpJynCiHLd6oWnAJhckZWbdtAAHqXQYIPRwTwoOBh3VPAz6IGWviAc/FmHM
+fYTphKuGTYu9atBEpDA+RyFVccnRRDEhWusEzZ7XkiDyWWhjKc2xSmpyqYmP2SCh
+q5pPidCy4cXKulC8hsDCk0oL4SH/UCh5xzHVlyyjSG/vqRqB9zq1PfPQMVjt1hZ7
+ieaMsAJdZRSuBxJEat0mh75xMcCoObZlBR8EELw4kOoKQGYjfEjqfLl0quTM5mr5
+4AHwAu2MvoowJvLntIEpDk7TkPG7UP4HWrnwk1Ri3a2TFRGjynvBlEw6sle5mlhp
+5cr2hjAll8+CRfNSv7h7wu7IPV1dIcoZVJaqcL934tOeeZM665ik0sfV55V+iJgk
+JInRiAgU6bAHlx4FXm+3yekz6DGhff9Y5yJmOn0tKSZKyYrIr538cGZnB2UwW3bK
+07G6Q6p3IDSw2L2VxE0ECDUuFyt6LZVNYPOVwiAoYn5mfS6R0CLqA+Ujr2wZTeXX
+cdfrOqghwIn3TqtNtSZotiHdhYEAor7q/H3x18vHMoxa1ZRK7GhzdSbKpahl/YzH
+S3L70eFnYMMVUxxojE+6
+=XKG4
+-----END PGP SIGNATURE-----
diff --git a/iproute2-3.6.0.tar.xz b/iproute2-3.6.0.tar.xz
new file mode 100644
index 0000000..8f290bd
--- /dev/null
+++ b/iproute2-3.6.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d17544da00e3f162139f66891c6ab5492d3cca7cfc8f7b517a5dca3c5560534
+size 395096
diff --git a/iproute2-libdir-1.diff b/iproute2-dirs.diff
similarity index 71%
rename from iproute2-libdir-1.diff
rename to iproute2-dirs.diff
index 5258792..ea1fd18 100644
--- a/iproute2-libdir-1.diff
+++ b/iproute2-dirs.diff
@@ -1,14 +1,14 @@
 ---
- Makefile           |    6 +++---
+ Makefile           |    4 ++--
  include/iptables.h |    2 +-
  netem/Makefile     |    6 ++++--
- 3 files changed, 8 insertions(+), 6 deletions(-)
+ 3 files changed, 7 insertions(+), 5 deletions(-)
 
-Index: iproute2-3.5.1/Makefile
+Index: iproute2-3.6.0/Makefile
 ===================================================================
---- iproute2-3.5.1.orig/Makefile
-+++ iproute2-3.5.1/Makefile
-@@ -1,10 +1,10 @@
+--- iproute2-3.6.0.orig/Makefile
++++ iproute2-3.6.0/Makefile
+@@ -1,7 +1,7 @@
  ROOTDIR=$(DESTDIR)
  PREFIX=/usr
  LIBDIR=$(PREFIX)/lib
@@ -16,11 +16,7 @@ Index: iproute2-3.5.1/Makefile
 +SBINDIR=/usr/sbin
  CONFDIR=/etc/iproute2
  DATADIR=$(PREFIX)/share
--DOCDIR=$(DATADIR)/doc/iproute2
-+DOCDIR=$(DATADIR)/doc/packages/iproute2
- MANDIR=$(DATADIR)/man
- ARPDDIR=/var/lib/arpd
- 
+ DOCDIR=$(DATADIR)/doc/iproute2
 @@ -35,7 +35,7 @@ HOSTCC = gcc
  DEFINES += -D_GNU_SOURCE
  CCOPTS = -O2
@@ -30,10 +26,10 @@ Index: iproute2-3.5.1/Makefile
  YACCFLAGS = -d -t -v
  
  SUBDIRS=lib ip tc bridge misc netem genl man
-Index: iproute2-3.5.1/include/iptables.h
+Index: iproute2-3.6.0/include/iptables.h
 ===================================================================
---- iproute2-3.5.1.orig/include/iptables.h
-+++ iproute2-3.5.1/include/iptables.h
+--- iproute2-3.6.0.orig/include/iptables.h
++++ iproute2-3.6.0/include/iptables.h
 @@ -5,7 +5,7 @@
  #include "libiptc/libiptc.h"
  
@@ -43,10 +39,10 @@ Index: iproute2-3.5.1/include/iptables.h
  #endif
  
  #ifndef IPPROTO_SCTP
-Index: iproute2-3.5.1/netem/Makefile
+Index: iproute2-3.6.0/netem/Makefile
 ===================================================================
---- iproute2-3.5.1.orig/netem/Makefile
-+++ iproute2-3.5.1/netem/Makefile
+--- iproute2-3.6.0.orig/netem/Makefile
++++ iproute2-3.6.0/netem/Makefile
 @@ -5,6 +5,8 @@ HOSTCC ?= $(CC)
  CCOPTS  = $(CBUILD_CFLAGS)
  LDLIBS += -lm 
diff --git a/iproute2.changes b/iproute2.changes
index 011c97f..576bde5 100644
--- a/iproute2.changes
+++ b/iproute2.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Oct  9 13:27:11 UTC 2012 - jengelh@inai.de
+
+- Update to new upstream release 3.6.0
+* ss: report SK_MEMINFO_BACKLOG
+* tc: add ipset ematch
+* iplink: add support for num[tr]xqueues
+* iproute2: Add FDB print and update cmds for self and master
+* iproute: Add ability to save, restore and show the interfaces'
+  addresses
+* iproute2: VTI support for ip link command
+- Rename iproute2-libdir-1.diff to iproute2-dirs.diff, as it does
+  more than just changing LIBDIR.
+- Add revert-pdf-creation.diff, as the new PDF creation commands
+  do not want to work with openSUSE 12.2 and before.
+
 -------------------------------------------------------------------
 Tue Sep 18 06:36:19 UTC 2012 - werner@suse.de
 
diff --git a/iproute2.spec b/iproute2.spec
index efb931f..209556e 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           iproute2
-Version:        3.5.1
+Version:        3.6.0
 Release:        0
 Summary:        Linux network configuration utilities
 License:        GPL-2.0
@@ -29,10 +29,9 @@ Url:            http://www.linuxfoundation.org/collaborate/workgroups/networking
 #Git-Clone:	git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2
 Source:         %name-%version.tar.xz
 Source2:        %name-%version.tar.sign
-# PATCH-FIX-UPSTREAM iproute2-libdir-1.diff status=unknown
-Patch0:         iproute2-libdir-1.diff
-# PATCH-??-OPENSUSE iproute2-HZ.diff status=noidea
-Patch1:         iproute2-HZ.diff
+Patch1:         iproute2-dirs.diff
+Patch2:         iproute2-HZ.diff
+Patch3:         revert-pdf-creation.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
 BuildRequires:  db-devel
@@ -105,44 +104,54 @@ as well as examples and other outdated files.
 tar -xf "%{S:0}" --use=xz;
 %setup -DTq
 %endif
-%patch -P 0 -P 1 -p1
+%patch -P 1 -P 2 -p1
+%if 0%{?sles_version} == 11 || (0%{?suse_version} && 0%{?suse_version} <= 1220)
+%patch -P 3 -p1
+%endif
 find . -name *.orig -delete
 
 %build
 # build with -fPIC. For details see
 # https://bugzilla.novell.com/show_bug.cgi?id=388021
-xtlibdir="$(pkg-config xtables --variable=xtlibdir)";
-make %{?_smp_mflags} LIBDIR=%_libdir CCOPTS="-D_GNU_SOURCE %optflags -Wstrict-prototypes -fPIC -DXT_LIB_DIR=\\\"$xtlibdir\\\""
+xt_libdir="$(pkg-config xtables --variable=xtlibdir)";
+xt_cflags="$(pkg-config xtables --cflags)";
+make %{?_smp_mflags} LIBDIR="%_libdir" CCOPTS="-D_GNU_SOURCE %optflags -Wstrict-prototypes -fPIC -DXT_LIB_DIR=\\\"$xt_libdir\\\" $xt_cflags"
 cd doc
 make pdf
 
 %install
-install -d %buildroot/{etc/,sbin/,usr/{sbin,share/man/man{3,8}}}
-install -d %buildroot/{/usr/include,%_libdir,/usr/share}
-make install DESTDIR=%buildroot LIBDIR=%_libdir \
-	MODDESTDIR="%buildroot/%_libdir/tc"
+b="%buildroot";
+install -d "$b"/{etc/,sbin/,usr/{sbin,share/man/man{3,8}}}
+install -d "$b"/{/usr/include,%_libdir,/usr/share}
+make install DESTDIR="$b" LIBDIR="%_libdir" \
+	MODDESTDIR="$b/%_libdir/tc" DOCDIR="%_docdir/%name";
 # We have m_xt
-rm -f "%buildroot/%_libdir/tc/m_ipt.so"
-install lib/libnetlink.a %buildroot/%_libdir
-chmod -x %buildroot/%_libdir/libnetlink.a
-install include/libnetlink.h %buildroot%_includedir
-chmod -x %buildroot%_includedir/libnetlink.h
+rm -f "$b/%_libdir/tc/m_ipt.so";
+install -pm0644 "lib/libnetlink.a" "$b/%_libdir/";
+chmod -x "$b/%_libdir/libnetlink.a";
+install -pm0644 "include/libnetlink.h" "$b/%_includedir/";
+chmod -x "$b/%_includedir/libnetlink.h";
 #UsrMerge
-ln -s %_sbindir/ip %buildroot/sbin
-mkdir -p %buildroot/bin
-ln -sf %_sbindir/ip %buildroot/bin/ip
+ln -s "%_sbindir/ip" "$b/sbin";
+mkdir -p "$b/bin";
+ln -sf "%_sbindir/ip" "$b/bin/ip";
 #EndUsrMerge
-rm %buildroot%_sbindir/ifcfg
+rm "$b/%_sbindir/ifcfg";
+
+mkdir -p "$b/%_docdir/%name";
+cp -an README* COPYING doc/*.pdf ip/{ifcfg,routef,routel} \
+	"$b/%_docdir/%name/";
 
 %files
 %defattr(-,root,root)
-%doc README* COPYING
+%dir %_docdir/%name
+%_docdir/%name/README*
+%_docdir/%name/COPYING
 %_sbindir/*
 #UsrMerge
 /sbin/*
 /bin/ip
 #EndUsrMerge
-#%_mandir/man7/*
 %_mandir/man8/*
 %dir %_sysconfdir/iproute2
 %config(noreplace) %_sysconfdir/iproute2/*
@@ -152,9 +161,9 @@ rm %buildroot%_sbindir/ifcfg
 
 %files doc
 %defattr(-,root,root)
-%doc doc/api-ip6-flowlabels.pdf doc/arpd.pdf doc/ip-cref.pdf
-%doc doc/ip-tunnels.pdf doc/nstat.pdf doc/rtstat.pdf doc/ss.pdf
-%doc examples/ ip/ifcfg ip/routef ip/routel
+%_docdir/iproute2
+%exclude %_docdir/iproute2/README*
+%exclude %_docdir/iproute2/COPYING
 
 %files -n libnetlink-devel
 %defattr(-,root,root)
diff --git a/revert-pdf-creation.diff b/revert-pdf-creation.diff
new file mode 100644
index 0000000..f5c2f1e
--- /dev/null
+++ b/revert-pdf-creation.diff
@@ -0,0 +1,54 @@
+Revert 0ecf26fc7d2f24570b4c04a668c437b8656a40a7, since it
+makes PDF creation fail on SUSE <= 12.2.
+
+(cannot find linuxdoc-sgml.sty; seems like /usr/lib/sgml-tool
+is not in the search path with texlive 2011/suse122.)
+
+diff --git a/doc/Makefile b/doc/Makefile
+index b92957e..1df6081 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -6,7 +6,7 @@ PSFILES=ip-cref.ps ip-tunnels.ps api-ip6-flowlabels.ps ss.ps nstat.ps arpd.ps rt
+ 
+ LATEX=latex
+ DVIPS=dvips
+-SGML2DVI=sgml2latex
++SGML2DVI=sgml2latex --output=dvi
+ SGML2HTML=sgml2html -s 0
+ LPR=lpr -Zsduplex
+ SHELL=bash
+@@ -31,11 +31,8 @@ pdf: $(PDFFILES)
+ print: $(PSFILES)
+ 	$(LPR) $(PSFILES)
+ 
+-%.tex: %.sgml
+-	$(SGML2DVI) --output=tex $<
+-
+ %.dvi: %.sgml
+-	$(SGML2DVI) --output=dvi $<
++	$(SGML2DVI) $<
+ 
+ %.dvi: %.tex
+ 	@set -e; pass=2; echo "Running LaTeX $<"; \
+@@ -47,17 +44,10 @@ print: $(PSFILES)
+ 		echo "Re-running LaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \
+ 	done
+ 
+-%.pdf: %.tex
+-	@set -e; pass=2; echo "Running pdfLaTeX $<"; \
+-	while [ `pdflatex $< </dev/null 2>&1 | \
+-		 grep -c '^\(LaTeX Warning: Label(s) may\|No file \|! Emergency stop\)'` -ge 1 ]; do \
+-		if [ $$pass -gt 3 ]; then \
+-			echo "Seems, something is wrong. Try by hands." ; exit 1 ; \
+-		fi; \
+-		echo "Re-running pdfLaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \
+-	done
+-#%.pdf: %.ps
+-#	ps2pdf $<
++#%.pdf: %.tex
++#	pdflatex $<
++%.pdf: %.ps
++	ps2pdf $<
+ 
+ %.ps: %.dvi
+ 	$(DVIPS) $< -o $@