diff --git a/ethtool-3.5.tar.sign b/ethtool-3.5.tar.sign
deleted file mode 100644
index 84e99a1..0000000
--- a/ethtool-3.5.tar.sign
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-iQEcBAABAgAGBQJQHCinAAoJEGkILBsOca60/hwH/2OquORQhWBZsopMyB6uoyl+
-86WWlZ5RoSuaBSM9J3cif2cABIA8JH/p3oT6rASEnQ+WhoBVMwXlhwLwhSZ6kvE4
-lIShEwygSkQkWWoQcnXjFqIcNJETPDfeaAc3c4oU5Z1M7pOsqIWbNt0c4zsHlLig
-OVsLfQCn/ZJkSziiMhaXGNsV+HVDwN99MMZllTQalxjyUh/hOj1BSzK+XpYmUTom
-IZTukwp9FYbW+LWQh2z5MFlb1V/0oNRc0Ci/07hbOQGaGaSCyDfaKXWH5PXM2q8l
-ap5RyUcxiNT5/Cd1rOqTUnOqRrmbhc68fAW8ziaYcEKETtZ8yfpEvQac2WBycUs=
-=4Leg
------END PGP SIGNATURE-----
diff --git a/ethtool-3.5.tar.xz b/ethtool-3.5.tar.xz
deleted file mode 100644
index 79442ef..0000000
--- a/ethtool-3.5.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:992f61b13e0f47d6cf08e59fd56a74a06402f0f5392c4a81ec3ecc574ede70a8
-size 176760
diff --git a/ethtool-3.6.tar.sign b/ethtool-3.6.tar.sign
new file mode 100644
index 0000000..288545c
--- /dev/null
+++ b/ethtool-3.6.tar.sign
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQEcBAABAgAGBQJQb2gNAAoJEGkILBsOca60xOIH/REQv5qZO+swnZPR63r1vuej
+7DL/eLwsRdxx3rp6AIWlCik8alIJKjbciS/qgoh6DYT7ERh9Ar8xC+95spHgS/LI
+xLb7VSEI8tE2kB86GkAbsrLSq1FycLDo6uIHU4CobtU+zlybq7aU8I00v424UfnY
+D3RbEBkkhax1+6GA+2KI/4lN/PZhV3d0B9tQ2HSiyf0zwpReeirFgFJjC25u8qcG
+u0Shy9GTSIG7+GIivuW8a97xZGK/B6GVQgedrmweccurEdw+I2j6MMjVJGRvbO8w
+rlZd2T/aib3+e3xcdb/QJyvH+9DlJHzqE5Ni6lP83tMiNhZdyWiipr1dlgDdBig=
+=Gpvx
+-----END PGP SIGNATURE-----
diff --git a/ethtool-3.6.tar.xz b/ethtool-3.6.tar.xz
new file mode 100644
index 0000000..f56a4fb
--- /dev/null
+++ b/ethtool-3.6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:76fd5471bd168baf504e44c5ff2d1ed4821e56073131d7e0a37d220f087090de
+size 178176
diff --git a/ethtool.changes b/ethtool.changes
index cc9f757..b217f61 100644
--- a/ethtool.changes
+++ b/ethtool.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Oct  8 06:54:42 UTC 2012 - puzel@suse.com
+
+- Update to new upstream release 3.6
+  * Feature: Allow setting MDI-X state (-s option)
+  * Fix: Preserve pause advertising bits when setting speed and
+    duplex with autoneg on (-s option)
+  * Fix: Don't call ioctl to set EEE parameters if they are the
+    same as the current parameters (--set-eee option)
+
 -------------------------------------------------------------------
 Mon Aug  6 07:46:35 UTC 2012 - puzel@suse.com
 
diff --git a/ethtool.spec b/ethtool.spec
index ac7df71..0b5ccfd 100644
--- a/ethtool.spec
+++ b/ethtool.spec
@@ -17,7 +17,7 @@
 
 
 Name:           ethtool
-Version:        3.5
+Version:        3.6
 Release:        0
 Summary:        Examine and Tune Ethernet-Based Network Interfaces
 License:        GPL-2.0