diff --git a/.gitignore b/.gitignore
index d358fba..00fbc3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ iproute2-2.6.35.tar.bz2
 /iproute2-2.6.38.tar.bz2
 /iproute2-2.6.38.1.tar.bz2
 /iproute2-2.6.39.tar.gz
+/iproute2-3.1.0.tar.bz2
diff --git a/iproute.spec b/iproute.spec
index f5d47b6..c9f33da 100644
--- a/iproute.spec
+++ b/iproute.spec
@@ -1,29 +1,24 @@
 %global             cbq_version v0.7.3
 Summary:            Advanced IP routing and network device configuration tools
 Name:               iproute
-Version:            2.6.39
-Release:            5%{?dist}
+Version:            3.1.0
+Release:            1%{?dist}
 Group:              Applications/System
-URL:                http://www.linuxfoundation.org/collaborate/workgroups/networking/%{name}2
-Source0:            http://devresources.linuxfoundation.org/dev/iproute2/download/%{name}2-%{version}.tar.gz
+URL:                http://kernel.org/pub/linux/utils/networking/%{name}2/
+Source0:            http://kernel.org/pub/linux/utils/networking/%{name}2/%{name}2-%{version}.tar.bz2
 Source1:            cbq-0000.example
 Source2:            avpkt
 Patch0:             man-pages.patch
 Patch1:             iproute2-2.6.29-kernel.patch
 Patch2:             iproute2-ss050901-opt_flags.patch
-Patch3:             iproute2-2.6.25-segfault.patch
-Patch4:             iproute2-sharepath.patch
-Patch5:             iproute2-2.6.31-tc_modules.patch
-Patch6:             iproute2-2.6.29-IPPROTO_IP_for_SA.patch
-Patch7:             iproute2-example-cbq-service.patch
-Patch8:             iproute2-2.6.35-print-route.patch
-Patch9:             iproute2-print-route-u32.patch
-Patch10:            iproute2-2.6.39-create-peer-veth-without-a-name.patch
-Patch11:            iproute2-2.6.39-xtables6.patch
-Patch12:            iproute2-2.6.39-lnstat-dump-to-stdout.patch
-Patch13:            iproute2-2.6.39-iproute2-ss-fix-missing-parameters.patch
-Patch14:            iproute2-2.6.39-iproute2-lnstat-fix-typos.patch
-Patch15:            iproute2-2.6.39-iproute2-arpd-fix-usage-and-manpage-options.patch
+Patch3:             iproute2-sharepath.patch
+Patch4:             iproute2-2.6.31-tc_modules.patch
+Patch5:             iproute2-2.6.29-IPPROTO_IP_for_SA.patch
+Patch6:             iproute2-example-cbq-service.patch
+Patch7:             iproute2-2.6.35-print-route.patch
+Patch8:             iproute2-print-route-u32.patch
+Patch9:             iproute2-2.6.39-create-peer-veth-without-a-name.patch
+Patch10:            iproute2-2.6.39-lnstat-dump-to-stdout.patch
 
 License:            GPLv2+ and Public Domain
 BuildRequires:      tex(latex) tex(dvips) linuxdoc-tools
@@ -59,19 +54,14 @@ The libnetlink static library.
 sed -i "s/_VERSION_/%{version}/" man/man8/ss.8
 %patch1 -p1 -b .kernel
 %patch2 -p1 -b .opt_flags
-%patch3 -p1 -b .seg
-%patch4 -p1 -b .share
-%patch5 -p1 -b .ipt
-%patch6 -p1 -b .ipproto
-%patch7 -p1 -b .fix_cbq
-%patch8 -p1 -b .print-route
-%patch9 -p1 -b .print-route-u32
-%patch10 -p1 -b .peer-veth-without-name
-%patch11 -p1 -b .xtables6
-%patch12 -p1 -b .lnstat-dump-to-stdout
-%patch13 -p1 -b .ss-usage
-%patch14 -p1 -b .lnstat-usage
-%patch15 -p1 -b .arpd-usage
+%patch3 -p1 -b .share
+%patch4 -p1 -b .ipt
+%patch5 -p1 -b .ipproto
+%patch6 -p1 -b .fix_cbq
+%patch7 -p1 -b .print-route
+%patch8 -p1 -b .print-route-u32
+%patch9 -p1 -b .peer-veth-without-name
+%patch10 -p1 -b .lnstat-dump-to-stdout
 
 %build
 export LIBDIR=/%{_libdir}
@@ -163,7 +153,6 @@ for config in \
 done
 
 %files
-%defattr(-,root,root,-)
 %dir %{_sysconfdir}/iproute2
 %doc COPYING
 %doc README README.decnet README.iproute2+tc README.distribution README.lnstat
@@ -179,20 +168,29 @@ done
 %config(noreplace) %{_sysconfdir}/sysconfig/cbq/*
 
 %files doc
-%defattr(-,root,root,-)
 %doc COPYING
 %doc doc/*.ps
 %doc examples
 %doc RELNOTES
 
 %files devel
-%defattr(-,root,root,-)
 %doc COPYING
 %{_mandir}/man3/*
 %{_libdir}/libnetlink.a
 %{_includedir}/libnetlink.h
 
 %changelog
+* Thu Nov 24 2011 Petr Šabata <contyk@redhat.com> - 3.1.0-1
+- 3.1.0 bump
+- Point URL and Source to the new location on kernel.org
+- Remove now obsolete defattr
+- Dropping various patches now included upstream
+- Dropping iproute2-2.6.25-segfault.patch; I fail to understand the reason for
+  this hack
+
+* Tue Nov 15 2011 Petr Šabata <contyk@redhat.com> - 2.6.39-6
+- ss -ul should display UDP CLOSED sockets (#691100)
+
 * Thu Oct 06 2011 Petr Sabata <contyk@redhat.com> - 2.6.39-5
 - Fix ss, lnstat and arpd usage and manpages
 
diff --git a/iproute2-2.6.39-iproute2-arpd-fix-usage-and-manpage-options.patch b/iproute2-2.6.39-iproute2-arpd-fix-usage-and-manpage-options.patch
deleted file mode 100644
index 50b66cb..0000000
--- a/iproute2-2.6.39-iproute2-arpd-fix-usage-and-manpage-options.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0936556fa65a1ca905934be78b537810567205b2 Mon Sep 17 00:00:00 2001
-From: Petr Sabata <contyk@redhat.com>
-Date: Thu, 6 Oct 2011 14:38:48 +0200
-Subject: [PATCH 3/3] iproute2: arpd - fix usage and manpage options
-
-Signed-off-by: Petr Sabata <contyk@redhat.com>
----
- man/man8/arpd.8 |    4 ++--
- misc/arpd.c     |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/man/man8/arpd.8 b/man/man8/arpd.8
-index d172600..37b6ba4 100644
---- a/man/man8/arpd.8
-+++ b/man/man8/arpd.8
-@@ -4,7 +4,7 @@
- arpd \- userspace arp daemon.
- 
- .SH SYNOPSIS
--Usage: arpd [ -lk ] [ -a N ] [ -b dbase ] [ -f file ] [ interfaces ]
-+Usage: arpd [ -lkh? ] [ -a N ] [ -b dbase ] [ -B number ] [ -f file ] [ -n time ] [ -R rate ] [ interfaces ]
- 
- .SH DESCRIPTION
- The
-@@ -34,7 +34,7 @@ Suppress sending broadcast queries by kernel. It takes sense together with optio
- -n <TIME>
- Timeout of negative cache. When resolution fails arpd suppresses further attempts to resolve for this period. It makes sense only together with option -k This timeout should not be too much longer than boot time of a typical host not supporting gratuitous ARP. Default value is 60 seconds.
- .TP
---r <RATE>
-+-R <RATE>
- Maximal steady rate of broadcasts sent by arpd in packets per second. Default value is 1.
- .TP
- -B <NUMBER>
-diff --git a/misc/arpd.c b/misc/arpd.c
-index 128c49d..124d3fb 100644
---- a/misc/arpd.c
-+++ b/misc/arpd.c
-@@ -94,7 +94,7 @@ int broadcast_burst = 3000;
- void usage(void)
- {
- 	fprintf(stderr,
--"Usage: arpd [ -lk ] [ -a N ] [ -b dbase ] [ -f file ] [ interfaces ]\n");
-+"Usage: arpd [ -lkh? ] [ -a N ] [ -b dbase ] [ -B number ] [ -f file ] [ -n time ] [ -R rate ] [ interfaces ]\n");
- 	exit(1);
- }
- 
--- 
-1.7.6.4
-
diff --git a/iproute2-2.6.39-iproute2-lnstat-fix-typos.patch b/iproute2-2.6.39-iproute2-lnstat-fix-typos.patch
deleted file mode 100644
index 75cb19b..0000000
--- a/iproute2-2.6.39-iproute2-lnstat-fix-typos.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a8e6d2d6a49e296ee7b4352e353c9cd745df5246 Mon Sep 17 00:00:00 2001
-From: Petr Sabata <contyk@redhat.com>
-Date: Thu, 6 Oct 2011 14:25:32 +0200
-Subject: [PATCH 2/3] iproute2: lnstat - fix typos
-
-Signed-off-by: Petr Sabata <contyk@redhat.com>
----
- misc/lnstat.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/misc/lnstat.c b/misc/lnstat.c
-index 32ab6a4..bd19cc1 100644
---- a/misc/lnstat.c
-+++ b/misc/lnstat.c
-@@ -45,7 +45,7 @@ static struct option opts[] = {
- 	{ "file", 1, NULL, 'f' },
- 	{ "help", 0, NULL, 'h' },
- 	{ "interval", 1, NULL, 'i' },
--	{ "key", 1, NULL, 'k' },
-+	{ "keys", 1, NULL, 'k' },
- 	{ "subject", 1, NULL, 's' },
- 	{ "width", 1, NULL, 'w' },
- };
-@@ -61,7 +61,7 @@ static int usage(char *name, int exit_code)
- 	fprintf(stderr, "\t-V --version\t\tPrint Version of Program\n");
- 	fprintf(stderr, "\t-c --count <count>\t"
- 			"Print <count> number of intervals\n");
--	fprintf(stderr, "\t-d --dumpt\t\t"
-+	fprintf(stderr, "\t-d --dump\t\t"
- 			"Dump list of available files/keys\n");
- 	fprintf(stderr, "\t-f --file <file>\tStatistics file to use\n");
- 	fprintf(stderr, "\t-h --help\t\tThis help message\n");
--- 
-1.7.6.4
-
diff --git a/iproute2-2.6.39-iproute2-ss-fix-missing-parameters.patch b/iproute2-2.6.39-iproute2-ss-fix-missing-parameters.patch
deleted file mode 100644
index d0950da..0000000
--- a/iproute2-2.6.39-iproute2-ss-fix-missing-parameters.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 886485fd9c87ed1594815e1aa2468c2cc959b105 Mon Sep 17 00:00:00 2001
-From: Petr Sabata <contyk@redhat.com>
-Date: Thu, 6 Oct 2011 14:21:57 +0200
-Subject: [PATCH 1/3] iproute2: ss - fix missing parameters
-
-Signed-off-by: Petr Sabata <contyk@redhat.com>
----
- man/man8/ss.8 |    4 ++--
- misc/ss.c     |    6 ++++--
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/man/man8/ss.8 b/man/man8/ss.8
-index b309df2..0b9a8c4 100644
---- a/man/man8/ss.8
-+++ b/man/man8/ss.8
-@@ -85,12 +85,12 @@ Display Unix domain sockets (alias for -f unix).
- Display sockets of type FAMILY.
- Currently the following families are supported: unix, inet, inet6, link, netlink.
- .TP
--.B \-A QUERY, \-\-query=QUERY
-+.B \-A QUERY, \-\-query=QUERY, \-\-socket=QUERY
- List of socket tables to dump, separated by commas. The following identifiers
- are understood: all, inet, tcp, udp, raw, unix, packet, netlink, unix_dgram,
- unix_stream, packet_raw, packet_dgram.
- .TP
--.B \-D FILE
-+.B \-D FILE, \-\-diag=FILE
- Do not display anything, just dump raw information about TCP sockets to FILE after applying filters. If FILE is - stdout is used.
- .TP
- .B \-F FILE, \-\-filter=FILE
-diff --git a/misc/ss.c b/misc/ss.c
-index 1597ff9..253f8d3 100644
---- a/misc/ss.c
-+++ b/misc/ss.c
-@@ -2416,9 +2416,10 @@ static void _usage(FILE *dest)
- "   -x, --unix		display only Unix domain sockets\n"
- "   -f, --family=FAMILY display sockets of type FAMILY\n"
- "\n"
--"   -A, --query=QUERY\n"
-+"   -A, --query=QUERY, --socket=QUERY\n"
- "       QUERY := {all|inet|tcp|udp|raw|unix|packet|netlink}[,QUERY]\n"
- "\n"
-+"   -D, --diag=FILE     Dump raw information about TCP sockets to FILE\n"
- "   -F, --filter=FILE   read filter information from FILE\n"
- "       FILTER := [ state TCP-STATE ] [ EXPRESSION ]\n"
- 		);
-@@ -2486,8 +2487,9 @@ static const struct option long_opts[] = {
- 	{ "packet", 0, 0, '0' },
- 	{ "family", 1, 0, 'f' },
- 	{ "socket", 1, 0, 'A' },
-+	{ "query", 1, 0, 'A' },
- 	{ "summary", 0, 0, 's' },
--	{ "diag", 0, 0, 'D' },
-+	{ "diag", 1, 0, 'D' },
- 	{ "filter", 1, 0, 'F' },
- 	{ "version", 0, 0, 'V' },
- 	{ "help", 0, 0, 'h' },
--- 
-1.7.6.4
-
diff --git a/iproute2-2.6.39-xtables6.patch b/iproute2-2.6.39-xtables6.patch
deleted file mode 100644
index d50d2ec..0000000
--- a/iproute2-2.6.39-xtables6.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 73de5d96804160e3e399bd81b135053f70b27e7b Mon Sep 17 00:00:00 2001
-From: Andreas Henriksson <andreas@fatal.se>
-Date: Mon, 4 Jul 2011 05:17:42 +0000
-Subject: [PATCH] iproute2: Fix building xt module against xtables version 6
-
-iptables/xtables apparently changed API again.... Now you need to pass
-and extra parameter (orig_opts) which was not needed before.
-
-Sprinkle some lovely pre-processor magic to be compatible with both older
-and new versions. In the beginning of times XTABLES_VERSION_CODE didn't
-exist. Then it was (0x10000 * major + 0x100 * minor + patch) when it was
-first introduced (according to git), but now it's at 6...
-Don't know what official iptables releases has defined it to over time.
-Lets just hope none of the older versions with is has the define
-higher then 6 is still around.... so only the "current" versioning
-scheme is supported.... lets see how long this lasts now.
-
-For the API change in xtables, see:
-http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commitdiff;h=600f38db82548a683775fd89b6e136673e924097
-
-Signed-off-by: Andreas Henriksson <andreas@fatal.se>
----
- tc/m_xt.c |   16 ++++++++++++----
- 1 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/tc/m_xt.c b/tc/m_xt.c
-index 651a59e..13bf19f 100644
---- a/tc/m_xt.c
-+++ b/tc/m_xt.c
-@@ -160,9 +160,13 @@ static int parse_ipt(struct action_util *a,int *argc_p,
- 					return -1;
- 				}
- 				tcipt_globals.opts =
--				    xtables_merge_options(tcipt_globals.opts,
--				                          m->extra_opts,
--				                          &m->option_offset);
-+				    xtables_merge_options(
-+#if (XTABLES_VERSION_CODE >= 6)
-+				        tcipt_globals.orig_opts,
-+#endif
-+				        tcipt_globals.opts,
-+				        m->extra_opts,
-+				        &m->option_offset);
- 			} else {
- 				fprintf(stderr," failed to find target %s\n\n", optarg);
- 				return -1;
-@@ -305,7 +309,11 @@ print_ipt(struct action_util *au,FILE * f, struct rtattr *arg)
- 			}
- 
- 			tcipt_globals.opts =
--			    xtables_merge_options(tcipt_globals.opts,
-+			    xtables_merge_options(
-+#if (XTABLES_VERSION_CODE >= 6)
-+				                  tcipt_globals.orig_opts,
-+#endif
-+				                  tcipt_globals.opts,
- 			                          m->extra_opts,
- 			                          &m->option_offset);
- 		} else {
--- 
-1.7.4.4
-
diff --git a/sources b/sources
index 01e3295..acf5deb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a3b6bc77c2ecf752284aa4a6fc630a6  iproute2-2.6.39.tar.gz
+ca1c899d147b4dd2caeb31316013344b  iproute2-3.1.0.tar.bz2